change log from apache common to slf4j

spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigProperties.java

@@ -18,8 +18,8 @@ package org.springframework.cloud.alibaba.nacos;
 
 import com.alibaba.nacos.api.NacosFactory;
 import com.alibaba.nacos.api.config.ConfigService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.core.env.Environment;
@@ -30,14 +30,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Properties;
 
-import static com.alibaba.nacos.api.PropertyKeyConst.ACCESS_KEY;
-import static com.alibaba.nacos.api.PropertyKeyConst.CLUSTER_NAME;
-import static com.alibaba.nacos.api.PropertyKeyConst.CONTEXT_PATH;
-import static com.alibaba.nacos.api.PropertyKeyConst.ENCODE;
-import static com.alibaba.nacos.api.PropertyKeyConst.ENDPOINT;
-import static com.alibaba.nacos.api.PropertyKeyConst.NAMESPACE;
-import static com.alibaba.nacos.api.PropertyKeyConst.SECRET_KEY;
-import static com.alibaba.nacos.api.PropertyKeyConst.SERVER_ADDR;
+import static com.alibaba.nacos.api.PropertyKeyConst.*;
 
 /**
  * nacos properties
@@ -49,9 +42,10 @@ import static com.alibaba.nacos.api.PropertyKeyConst.SERVER_ADDR;
 @ConfigurationProperties(NacosConfigProperties.PREFIX)
 public class NacosConfigProperties {
 
-	static final String PREFIX = "spring.cloud.nacos.config";
+	public static final String PREFIX = "spring.cloud.nacos.config";
 
-	private static final Log log = LogFactory.getLog(NacosConfigProperties.class);
+	private static final Logger log = LoggerFactory
+			.getLogger(NacosConfigProperties.class);
 
 	/**
 	 * whether to enable nacos config.
@@ -368,11 +362,8 @@ public class NacosConfigProperties {
 			return configService;
 		}
 		catch (Exception e) {
-			log.error(
-					"create config service error!properties=" + this.toString() + ",e=,",
-					e);
+			log.error("create config service error!properties={},e=,", this, e);
 			return null;
 		}
 	}
-
 }

spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/NacosPropertySourceRepository.java

@@ -24,6 +24,7 @@ import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * @author xiaojing
+ * @author pbting
  */
 public class NacosPropertySourceRepository {
 
@@ -45,6 +46,7 @@ public class NacosPropertySourceRepository {
 	}
 
 	public static NacosPropertySource getNacosPropertySource(String dataId) {
+
 		return nacosPropertySourceRepository.get(dataId);
 	}
 }

spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/client/NacosPropertySourceBuilder.java

@@ -18,7 +18,6 @@ package org.springframework.cloud.alibaba.nacos.client;
 
 import com.alibaba.nacos.api.config.ConfigService;
 import com.alibaba.nacos.api.exception.NacosException;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
@@ -27,11 +26,7 @@ import org.springframework.core.io.ByteArrayResource;
 import org.springframework.util.StringUtils;
 
 import java.io.StringReader;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
+import java.util.*;
 
 /**
  * @author xiaojing
@@ -103,11 +98,10 @@ public class NacosPropertySourceBuilder {
 			}
 		}
 		catch (NacosException e) {
-			log.error("get data from Nacos error,dataId:" + dataId + ", ", e);
+			log.error("get data from Nacos error,dataId:{}, ", dataId, e);
 		}
 		catch (Exception e) {
-			log.error("parse data from Nacos error,dataId:" + dataId + ",data:" + data
-					+ ",", e);
+			log.error("parse data from Nacos error,dataId:{},data:{},", dataId, data, e);
 		}
 		return EMPTY_PROPERTIES;
 	}

spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/client/NacosPropertySourceLocator.java

@@ -17,7 +17,6 @@
 package org.springframework.cloud.alibaba.nacos.client;
 
 import com.alibaba.nacos.api.config.ConfigService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.alibaba.nacos.NacosConfigProperties;