From 77c3db072422926c605ade1d21ee68f9487c5213 Mon Sep 17 00:00:00 2001
From: wulingxiao <1251605638@qqcom>
Date: Wed, 20 Jul 2022 23:47:56 +0800
Subject: [PATCH] feature:support spring cloud configData

---
 CHANGELOG.md                                              | 1 +
 .../config/configdata/PolarisConfigDataLoader.java        | 2 +-
 .../configdata/PolarisConfigDataLocationResolver.java     | 8 ++++++--
 .../configdata/PolarisConfigDataLocationResolverTest.java | 6 ------
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f95d8ce3..bbd1acebc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,3 +6,4 @@
 - [Feature: add rate limit filter debug log](https://github.com/Tencent/spring-cloud-tencent/pull/437)
 - [Add configurable heartbeat interval support](https://github.com/Tencent/spring-cloud-tencent/pull/444)
 - [feat:enhance Feign and RestTemplate and support Polaris monitor.](https://github.com/Tencent/spring-cloud-tencent/pull/447)
+- [Feature: support spring cloud config data.](https://github.com/Tencent/spring-cloud-tencent/pull/451)
diff --git a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/configdata/PolarisConfigDataLoader.java b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/configdata/PolarisConfigDataLoader.java
index 14fc9ddbc..1354708c7 100644
--- a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/configdata/PolarisConfigDataLoader.java
+++ b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/configdata/PolarisConfigDataLoader.java
@@ -121,7 +121,7 @@ public class PolarisConfigDataLoader implements ConfigDataLoader<PolarisConfigDa
 		}
 		// load config data
 		if (StringUtils.hasText(resource.getFileName())) {
-			log.info("loading config data config file,group:" + resource.getGroupName() + "file:" + resource.getFileName());
+			log.info("loading config data config file, group:" + resource.getGroupName() + " file: " + resource.getFileName());
 			this.puller.initCustomPolarisConfigFile(compositePropertySource, configFileGroup(resource));
 		}
 		return compositePropertySource;
diff --git a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/configdata/PolarisConfigDataLocationResolver.java b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/configdata/PolarisConfigDataLocationResolver.java
index c0cd09308..a5e68691c 100644
--- a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/configdata/PolarisConfigDataLocationResolver.java
+++ b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/configdata/PolarisConfigDataLocationResolver.java
@@ -188,9 +188,13 @@ public class PolarisConfigDataLocationResolver implements
 		String serviceName = loadPolarisConfigProperties(resolverContext,
 				String.class, "spring.application.name");
 		String groupName = StringUtils.isBlank(groupFileName) ? EMPTY_STRING : parseGroupName(groupFileName, serviceName);
-		log.info("group from configDataLocation is" + groupName);
+		if (StringUtils.isNotBlank(groupName)) {
+			log.info("group from configDataLocation is " + groupName);
+		}
 		String fileName = StringUtils.isBlank(groupFileName) ? EMPTY_STRING : parseFileName(groupFileName);
-		log.info("file from configDataLocation is" + fileName);
+		if (StringUtils.isNotBlank(fileName)) {
+			log.info("file from configDataLocation is " + fileName);
+		}
 		PolarisConfigDataResource polarisConfigDataResource = new PolarisConfigDataResource(
 				polarisConfigProperties,
 				polarisContextProperties,
diff --git a/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/configdata/PolarisConfigDataLocationResolverTest.java b/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/configdata/PolarisConfigDataLocationResolverTest.java
index eb672644f..14878218a 100644
--- a/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/configdata/PolarisConfigDataLocationResolverTest.java
+++ b/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/configdata/PolarisConfigDataLocationResolverTest.java
@@ -5,7 +5,6 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import org.springframework.boot.ConfigurableBootstrapContext;
 import org.springframework.boot.context.config.ConfigDataLocation;
 import org.springframework.boot.context.config.ConfigDataLocationResolverContext;
 import org.springframework.boot.context.properties.bind.Binder;
@@ -33,13 +32,9 @@ public class PolarisConfigDataLocationResolverTest {
 
 	private final Binder environmentBinder = Binder.get(this.environment);
 
-	@Mock
-	private ConfigurableBootstrapContext bootstrapContext;
-
 	@Test
 	public void testIsResolvable() {
 		when(context.getBinder()).thenReturn(environmentBinder);
-		when(context.getBootstrapContext()).thenReturn(bootstrapContext);
 		assertThat(
 				this.resolver.isResolvable(this.context, ConfigDataLocation.of("configserver:")))
 				.isFalse();
@@ -55,7 +50,6 @@ public class PolarisConfigDataLocationResolverTest {
 	public void unEnabledPolarisConfigData() {
 		environment.setProperty("spring.cloud.polaris.config.enabled", "false");
 		when(context.getBinder()).thenReturn(environmentBinder);
-		when(context.getBootstrapContext()).thenReturn(bootstrapContext);
 		assertThat(
 				this.resolver.isResolvable(this.context, ConfigDataLocation.of("polaris:")))
 				.isFalse();