add appName for config center (#51)

Author: wangqj

spring-cloud-huawei-config/src/main/java/org/springframework/cloud/huawei/config/ConfigWatch.java

@@ -60,15 +60,12 @@ public class ConfigWatch implements ApplicationEventPublisherAware, SmartLifecyc
 
   private RefreshRecord refreshRecord;
 
-  public ConfigWatch(ServiceCombConfigProperties serviceCombConfigProperties,
-      ServiceCombConfigClient serviceCombConfigClient, ContextRefresher contextRefresher, RefreshRecord refreshRecord) {
-    this.serviceCombConfigProperties = serviceCombConfigProperties;
-    this.serviceCombConfigClient = serviceCombConfigClient;
+  private String project;
+
+  public ConfigWatch() {
     ThreadPoolTaskScheduler threadPool = new ThreadPoolTaskScheduler();
     threadPool.initialize();
     taskScheduler = threadPool;
-    this.contextRefresher = contextRefresher;
-    this.refreshRecord = refreshRecord;
   }
 
   @Override
@@ -89,8 +86,9 @@ private void watch() {
     Map<String, String> remoteConfig = null;
     if (ready.get()) {
       try {
-        remoteConfig = serviceCombConfigClient.loadAll("price" + ConfigConstants.DEFAULT_SEPARATOR
-            + ConfigConstants.DEFAULT_PROJECT);
+        remoteConfig = serviceCombConfigClient.loadAll(
+            serviceCombConfigProperties.getServiceName() + ConfigConstants.DEFAULT_SEPARATOR
+                + serviceCombConfigProperties.getAppName(), project);
       } catch (RemoteOperationException e) {
         LOGGER.warn(e.getMessage());
       }
@@ -143,4 +141,31 @@ public void stop(Runnable callback) {
   public int getPhase() {
     return 0;
   }
+
+
+  public void setServiceCombConfigProperties(
+      ServiceCombConfigProperties serviceCombConfigProperties) {
+    this.serviceCombConfigProperties = serviceCombConfigProperties;
+  }
+
+  public void setServiceCombConfigClient(
+      ServiceCombConfigClient serviceCombConfigClient) {
+    this.serviceCombConfigClient = serviceCombConfigClient;
+  }
+
+  public void setWatchScheduledFuture(ScheduledFuture<?> watchScheduledFuture) {
+    this.watchScheduledFuture = watchScheduledFuture;
+  }
+
+  public void setContextRefresher(ContextRefresher contextRefresher) {
+    this.contextRefresher = contextRefresher;
+  }
+
+  public void setRefreshRecord(RefreshRecord refreshRecord) {
+    this.refreshRecord = refreshRecord;
+  }
+
+  public void setProject(String project) {
+    this.project = project;
+  }
 }

spring-cloud-huawei-config/src/main/java/org/springframework/cloud/huawei/config/ServiceCombConfigAutoConfiguration.java

@@ -22,6 +22,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.cloud.common.transport.ServiceCombSSLProperties;
 import org.springframework.cloud.context.refresh.ContextRefresher;
 import org.springframework.cloud.huawei.config.client.RefreshRecord;
 import org.springframework.cloud.huawei.config.client.ServiceCombConfigClient;
@@ -63,8 +64,15 @@ public RefreshRecord refreshRecord() {
         matchIfMissing = true)
     public ConfigWatch configWatch(ServiceCombConfigProperties serviceCombConfigProperties,
         ServiceCombConfigClient serviceCombConfigClient,
-        ContextRefresher contextRefresher, RefreshRecord refreshRecord) {
-      return new ConfigWatch(serviceCombConfigProperties, serviceCombConfigClient, contextRefresher, refreshRecord);
+        ContextRefresher contextRefresher, RefreshRecord refreshRecord,
+        ServiceCombSSLProperties serviceCombSSLProperties) {
+      ConfigWatch watch = new ConfigWatch();
+      watch.setProject(serviceCombSSLProperties.getProject());
+      watch.setContextRefresher(contextRefresher);
+      watch.setServiceCombConfigClient(serviceCombConfigClient);
+      watch.setServiceCombConfigProperties(serviceCombConfigProperties);
+      watch.setRefreshRecord(refreshRecord);
+      return watch;
     }
   }
 

spring-cloud-huawei-config/src/main/java/org/springframework/cloud/huawei/config/ServiceCombConfigBootstrapConfiguration.java

@@ -65,7 +65,8 @@ public ServiceCombConfigClient serviceCombConfigClient(ServiceCombConfigProperti
   @Bean
   public ServiceCombPropertySourceLocator serviceCombPropertySourceLocator(
       ServiceCombConfigProperties serviceCombConfigProperties,
-      ServiceCombConfigClient serviceCombConfigClient) {
-    return new ServiceCombPropertySourceLocator(serviceCombConfigProperties, serviceCombConfigClient);
+      ServiceCombConfigClient serviceCombConfigClient, ServiceCombSSLProperties serviceCombSSLProperties) {
+    return new ServiceCombPropertySourceLocator(serviceCombConfigProperties, serviceCombConfigClient,
+        serviceCombSSLProperties.getProject());
   }
 }

spring-cloud-huawei-config/src/main/java/org/springframework/cloud/huawei/config/ServiceCombConfigProperties.java

@@ -17,6 +17,7 @@
 
 package org.springframework.cloud.huawei.config;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
@@ -30,6 +31,12 @@ public class ServiceCombConfigProperties {
 
   private boolean enable = true;
 
+  @Value("${spring.cloud.servicecomb.discovery.serviceName:${spring.application.name}}")
+  private String serviceName;
+
+  @Value("${spring.cloud.servicecomb.discovery.appName:default}")
+  private String appName;
+
   private String serverAddr;
 
   private Watch watch = new Watch();
@@ -68,6 +75,22 @@ public void setWatch(Watch watch) {
     this.watch = watch;
   }
 
+  public String getServiceName() {
+    return serviceName;
+  }
+
+  public void setServiceName(String serviceName) {
+    this.serviceName = serviceName;
+  }
+
+  public String getAppName() {
+    return appName;
+  }
+
+  public void setAppName(String appName) {
+    this.appName = appName;
+  }
+
   public static class Watch {
     private boolean enable;
 

spring-cloud-huawei-config/src/main/java/org/springframework/cloud/huawei/config/ServiceCombConfigPropertySource.java

@@ -45,9 +45,10 @@ public ServiceCombConfigPropertySource(String name,
   }
 
   @Retryable(interceptor = "serviceCombConfigRetryInterceptor")
-  public Map<String, String> loadAllRemoteConfig(String serviceName) throws RemoteOperationException {
-    Map<String, String> remoteConfig = serviceCombConfigClient.loadAll(serviceName + ConfigConstants.DEFAULT_SEPARATOR
-        + ConfigConstants.DEFAULT_PROJECT);
+  public Map<String, String> loadAllRemoteConfig(String serviceName, String appName, String project)
+      throws RemoteOperationException {
+    Map<String, String> remoteConfig = serviceCombConfigClient
+        .loadAll(serviceName + ConfigConstants.DEFAULT_SEPARATOR + appName, project);
     properties.putAll(remoteConfig);
     return remoteConfig;
   }

spring-cloud-huawei-config/src/main/java/org/springframework/cloud/huawei/config/ServiceCombPropertySourceLocator.java

@@ -37,25 +37,28 @@ public class ServiceCombPropertySourceLocator implements PropertySourceLocator {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(ServiceCombPropertySourceLocator.class);
 
+  private String project;
 
   private ServiceCombConfigProperties serviceCombConfigProperties;
 
   private ServiceCombConfigClient serviceCombConfigClient;
 
   public ServiceCombPropertySourceLocator(ServiceCombConfigProperties serviceCombConfigProperties,
-      ServiceCombConfigClient serviceCombConfigClient) {
+      ServiceCombConfigClient serviceCombConfigClient, String project) {
     this.serviceCombConfigClient = serviceCombConfigClient;
     this.serviceCombConfigProperties = serviceCombConfigProperties;
+    this.project = project;
   }
 
   @Override
   public PropertySource<?> locate(Environment environment) {
     ServiceCombConfigPropertySource serviceCombConfigPropertySource = new ServiceCombConfigPropertySource(
         ConfigConstants.PROPERTYSOURCE_NAME,
         serviceCombConfigClient);
-    String serviceName = environment.getProperty(ConfigConstants.SERVICE_NAME);
     try {
-      serviceCombConfigPropertySource.loadAllRemoteConfig(serviceName);
+      serviceCombConfigPropertySource
+          .loadAllRemoteConfig(serviceCombConfigProperties.getServiceName(), serviceCombConfigProperties.getAppName(),
+              project);
     } catch (RemoteOperationException e) {
       LOGGER.error(e.getMessage(), e);
     }

spring-cloud-huawei-config/src/main/java/org/springframework/cloud/huawei/config/client/ServiceCombConfigClient.java

@@ -54,13 +54,14 @@ public ServiceCombConfigClient(String url, HttpTransport httpTransport) {
    * @return
    * @throws RemoteOperationException
    */
-  public Map<String, String> loadAll(String dimensionsInfo) throws RemoteOperationException {
+  public Map<String, String> loadAll(String dimensionsInfo, String project) throws RemoteOperationException {
     Response response = null;
     Map<String, String> result = new HashMap<>();
     try {
+      project = project != null && !project.isEmpty() ? project : ConfigConstants.DEFAULT_PROJECT;
       response = httpTransport.sendGetRequest(
-          url + "/" + ConfigConstants.DEFAULT_API_VERSION + "/" + ConfigConstants.DEFAULT_PROJECT
-              + "/configuration/items?dimensionsInfo=" + dimensionsInfo);
+          url + "/" + ConfigConstants.DEFAULT_API_VERSION + "/" + project + "/configuration/items?dimensionsInfo="
+              + dimensionsInfo);
       if (response == null) {
         return result;
       }

spring-cloud-huawei-config/src/test/java/org/springframework/cloud/huawei/config/ConfigWatchTest.java

@@ -13,13 +13,13 @@ public class ConfigWatchTest {
 
   @Test
   public void isRunning() {
-    ConfigWatch configWatch = new ConfigWatch(null, null, null, null);
+    ConfigWatch configWatch = new ConfigWatch();
     assertEquals(configWatch.isRunning(), false);
   }
 
   @Test
   public void isAutoStartup() {
-    ConfigWatch configWatch = new ConfigWatch(null, null, null, null);
+    ConfigWatch configWatch = new ConfigWatch();
     assertEquals(configWatch.isAutoStartup(), true);
   }
 }

spring-cloud-huawei-config/src/test/java/org/springframework/cloud/huawei/config/ServiceCombConfigPropertySourceTest.java

@@ -33,13 +33,13 @@ public void loadAllRemoteConfig(@Injectable String name, @Injectable ServiceComb
     map.put("d", "r");
     new Expectations() {
       {
-        source.loadAll(anyString);
+        source.loadAll(anyString, anyString);
         result = map;
       }
     };
     ServiceCombConfigPropertySource serviceCombConfigPropertySource = new ServiceCombConfigPropertySource(name, source);
     Deencapsulation.setField(serviceCombConfigPropertySource, properties);
-    Map<String, String> result = serviceCombConfigPropertySource.loadAllRemoteConfig("");
+    Map<String, String> result = serviceCombConfigPropertySource.loadAllRemoteConfig("", "", "");
     Assert.assertEquals(result.size(), 2);
   }
 

spring-cloud-huawei-config/src/test/java/org/springframework/cloud/huawei/config/ServiceCombPropertySourceLocatorTest.java

@@ -35,7 +35,7 @@ public void locate(
     Assert.assertEquals(watch.getDelay(), 10);
     serviceCombConfigProperties.setWatch(watch);
     ServiceCombPropertySourceLocator serviceCombPropertySourceLocator = new ServiceCombPropertySourceLocator(
-        serviceCombConfigProperties, serviceCombConfigClient);
+        serviceCombConfigProperties, serviceCombConfigClient, "default");
     PropertySource<?> result = serviceCombPropertySourceLocator.locate(environment);
     Assert.assertEquals(result.getName(), ConfigConstants.PROPERTYSOURCE_NAME);
   }