sync & commit in edgware

spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/RuleType.java

@@ -16,8 +16,6 @@
 
 package com.alibaba.cloud.sentinel.datasource;
 
-import org.springframework.util.StringUtils;
-
 import com.alibaba.cloud.sentinel.datasource.config.AbstractDataSourceProperties;
 import com.alibaba.csp.sentinel.slots.block.AbstractRule;
 import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRule;
@@ -26,6 +24,8 @@ import com.alibaba.csp.sentinel.slots.block.flow.FlowRule;
 import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowRule;
 import com.alibaba.csp.sentinel.slots.system.SystemRule;
 
+import org.springframework.util.StringUtils;
+
 /**
  * Enum for {@link AbstractRule} class, using in
  * {@link AbstractDataSourceProperties#ruleType}

spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/AbstractDataSourceProperties.java

@@ -18,8 +18,6 @@ package com.alibaba.cloud.sentinel.datasource.config;
 
 import javax.validation.constraints.NotNull;
 
-import org.springframework.core.env.Environment;
-
 import com.alibaba.cloud.sentinel.datasource.RuleType;
 import com.alibaba.csp.sentinel.adapter.gateway.common.api.GatewayApiDefinitionManager;
 import com.alibaba.csp.sentinel.adapter.gateway.common.rule.GatewayRuleManager;
@@ -32,6 +30,8 @@ import com.alibaba.csp.sentinel.slots.system.SystemRuleManager;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
+import org.springframework.core.env.Environment;
+
 /**
  * Abstract class Using by {@link DataSourcePropertiesConfiguration}
  *

spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/DataSourcePropertiesConfiguration.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.alibaba.cloud.sentinel.datasource.config;
 
 import java.lang.reflect.Field;
@@ -6,10 +22,10 @@ import java.util.List;
 
 import javax.validation.Valid;
 
-import org.springframework.util.ObjectUtils;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
+import org.springframework.util.ObjectUtils;
+
 /**
  * Using By ConfigurationProperties.
  *

spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/FileDataSourceProperties.java

@@ -20,11 +20,11 @@ import java.io.IOException;
 
 import javax.validation.constraints.NotNull;
 
+import com.alibaba.cloud.sentinel.datasource.factorybean.FileRefreshableDataSourceFactoryBean;
+
 import org.springframework.util.ResourceUtils;
 import org.springframework.util.StringUtils;
 
-import com.alibaba.cloud.sentinel.datasource.factorybean.FileRefreshableDataSourceFactoryBean;
-
 /**
  * File Properties class Using by {@link DataSourcePropertiesConfiguration} and
  * {@link FileRefreshableDataSourceFactoryBean}

spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/NacosDataSourceProperties.java

@@ -18,10 +18,10 @@ package com.alibaba.cloud.sentinel.datasource.config;
 
 import javax.validation.constraints.NotNull;
 
-import org.springframework.util.StringUtils;
-
 import com.alibaba.cloud.sentinel.datasource.factorybean.NacosDataSourceFactoryBean;
 
+import org.springframework.util.StringUtils;
+
 /**
  * Nacos Properties class Using by {@link DataSourcePropertiesConfiguration} and
  * {@link NacosDataSourceFactoryBean}

spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/ZookeeperDataSourceProperties.java

@@ -16,10 +16,10 @@
 
 package com.alibaba.cloud.sentinel.datasource.config;
 
-import org.springframework.util.StringUtils;
-
 import com.alibaba.cloud.sentinel.datasource.factorybean.ZookeeperDataSourceFactoryBean;
 
+import org.springframework.util.StringUtils;
+
 /**
  * Zookeeper Properties class Using by {@link DataSourcePropertiesConfiguration} and
  * {@link ZookeeperDataSourceFactoryBean}
@@ -32,7 +32,7 @@ public class ZookeeperDataSourceProperties extends AbstractDataSourceProperties
 		super(ZookeeperDataSourceFactoryBean.class.getName());
 	}
 
-	private String serverAddr;
+	private String serverAddr = "localhost:2181";
 
 	private String path;
 

spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/SentinelConverter.java

@@ -23,10 +23,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.util.StringUtils;
-
 import com.alibaba.csp.sentinel.datasource.Converter;
 import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRule;
 import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule;
@@ -36,6 +32,10 @@ import com.alibaba.csp.sentinel.slots.system.SystemRule;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.util.StringUtils;
 
 /**
  * Convert sentinel rules for json or xml array Using strict mode to parse json or xml

spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/ApolloDataSourceFactoryBean.java

@@ -1,10 +1,10 @@
 package com.alibaba.cloud.sentinel.datasource.factorybean;
 
-import org.springframework.beans.factory.FactoryBean;
-
 import com.alibaba.csp.sentinel.datasource.Converter;
 import com.alibaba.csp.sentinel.datasource.apollo.ApolloDataSource;
 
+import org.springframework.beans.factory.FactoryBean;
+
 /**
  * A {@link FactoryBean} for creating {@link ApolloDataSource} instance.
  *

spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/FileRefreshableDataSourceFactoryBean.java

@@ -3,11 +3,11 @@ package com.alibaba.cloud.sentinel.datasource.factorybean;
 import java.io.File;
 import java.nio.charset.Charset;
 
-import org.springframework.beans.factory.FactoryBean;
-
 import com.alibaba.csp.sentinel.datasource.Converter;
 import com.alibaba.csp.sentinel.datasource.FileRefreshableDataSource;
 
+import org.springframework.beans.factory.FactoryBean;
+
 /**
  * A {@link FactoryBean} for creating {@link FileRefreshableDataSource} instance.
  *

spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/NacosDataSourceFactoryBean.java

@@ -18,13 +18,13 @@ package com.alibaba.cloud.sentinel.datasource.factorybean;
 
 import java.util.Properties;
 
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.util.StringUtils;
-
 import com.alibaba.csp.sentinel.datasource.Converter;
 import com.alibaba.csp.sentinel.datasource.nacos.NacosDataSource;
 import com.alibaba.nacos.api.PropertyKeyConst;
 
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.util.StringUtils;
+
 /**
  * A {@link FactoryBean} for creating {@link NacosDataSource} instance.
  *

spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/ZookeeperDataSourceFactoryBean.java

@@ -1,11 +1,11 @@
 package com.alibaba.cloud.sentinel.datasource.factorybean;
 
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.FactoryBean;
-
 import com.alibaba.csp.sentinel.datasource.Converter;
 import com.alibaba.csp.sentinel.datasource.zookeeper.ZookeeperDataSource;
 
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.util.StringUtils;
+
 /**
  * A {@link FactoryBean} for creating {@link ZookeeperDataSource} instance.
  *
@@ -25,7 +25,7 @@ public class ZookeeperDataSourceFactoryBean implements FactoryBean<ZookeeperData
 
 	@Override
 	public ZookeeperDataSource getObject() throws Exception {
-		if (StringUtils.isNotEmpty(groupId) && StringUtils.isNotEmpty(dataId)) {
+		if (!StringUtils.isEmpty(groupId) && !StringUtils.isEmpty(dataId)) {
 			// the path will be /{groupId}/{dataId}
 			return new ZookeeperDataSource(serverAddr, groupId, dataId, converter);
 		}

spring-cloud-alibaba-sentinel-datasource/src/main/resources/META-INF/sentinel-datasource.properties

@@ -1,4 +1,5 @@
 nacos = com.alibaba.csp.sentinel.datasource.nacos.NacosDataSource
 file =com.alibaba.csp.sentinel.datasource.FileRefreshableDataSource
 apollo = com.alibaba.csp.sentinel.datasource.apollo.ApolloDataSource
-zk = com.alibaba.csp.sentinel.datasource.zookeeper.ZookeeperDataSource
+zk = com.alibaba.csp.sentinel.datasource.zookeeper.ZookeeperDataSource
+redis = com.alibaba.csp.sentinel.datasource.redis.RedisDataSource