polish #761 update pkg name & maven coordinate for Edgware

spring-cloud-alibaba-sentinel-datasource/pom.xml

@@ -3,13 +3,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-alibaba</artifactId>
         <version>0.1.3.BUILD-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-alibaba-sentinel-datasource</artifactId>
     <name>Spring Cloud Alibaba Sentinel DataSource</name>
 

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

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.datasource;
+package com.alibaba.cloud.sentinel.datasource;
 
-import org.springframework.cloud.alibaba.sentinel.datasource.config.AbstractDataSourceProperties;
 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;
 import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.datasource;
+package com.alibaba.cloud.sentinel.datasource;
 
 /**
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>

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

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.datasource.config;
+package com.alibaba.cloud.sentinel.datasource.config;
 
 import javax.validation.constraints.NotNull;
 
-import org.springframework.cloud.alibaba.sentinel.datasource.RuleType;
 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;
 import com.alibaba.csp.sentinel.datasource.AbstractDataSource;

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

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.datasource.config;
+package com.alibaba.cloud.sentinel.datasource.config;
 
 import javax.validation.constraints.NotNull;
 
-import org.springframework.cloud.alibaba.sentinel.datasource.factorybean.ApolloDataSourceFactoryBean;
+import com.alibaba.cloud.sentinel.datasource.factorybean.ApolloDataSourceFactoryBean;
 
 /**
  * Apollo Properties class Using by {@link DataSourcePropertiesConfiguration} and

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

@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.sentinel.datasource.config;
+package com.alibaba.cloud.sentinel.datasource.config;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -21,16 +21,16 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
  */
 public class DataSourcePropertiesConfiguration {
 
-    @Valid
+	@Valid
 	private FileDataSourceProperties file;
 
-    @Valid
+	@Valid
 	private NacosDataSourceProperties nacos;
 
-    @Valid
+	@Valid
 	private ZookeeperDataSourceProperties zk;
 
-    @Valid
+	@Valid
 	private ApolloDataSourceProperties apollo;
 
 	public DataSourcePropertiesConfiguration() {

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

@@ -14,16 +14,17 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.datasource.config;
+package com.alibaba.cloud.sentinel.datasource.config;
 
 import java.io.IOException;
 
 import javax.validation.constraints.NotNull;
 
-import org.springframework.cloud.alibaba.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

@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.datasource.config;
+package com.alibaba.cloud.sentinel.datasource.config;
 
 import javax.validation.constraints.NotNull;
 
-import org.springframework.cloud.alibaba.sentinel.datasource.factorybean.NacosDataSourceFactoryBean;
 import org.springframework.util.StringUtils;
 
+import com.alibaba.cloud.sentinel.datasource.factorybean.NacosDataSourceFactoryBean;
+
 /**
  * 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

@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.datasource.config;
+package com.alibaba.cloud.sentinel.datasource.config;
 
-import javax.validation.constraints.NotNull;
-
-import org.springframework.cloud.alibaba.sentinel.datasource.factorybean.ZookeeperDataSourceFactoryBean;
 import org.springframework.util.StringUtils;
 
+import com.alibaba.cloud.sentinel.datasource.factorybean.ZookeeperDataSourceFactoryBean;
+
 /**
  * Zookeeper Properties class Using by {@link DataSourcePropertiesConfiguration} and
  * {@link ZookeeperDataSourceFactoryBean}

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.datasource.converter;
+package com.alibaba.cloud.sentinel.datasource.converter;
 
 import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRule;
 import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.datasource.converter;
+package com.alibaba.cloud.sentinel.datasource.converter;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -24,9 +24,9 @@ import java.util.List;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.cloud.alibaba.sentinel.datasource.RuleType;
 import org.springframework.util.StringUtils;
 
+import com.alibaba.cloud.sentinel.datasource.RuleType;
 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;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.datasource.converter;
+package com.alibaba.cloud.sentinel.datasource.converter;
 
 import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRule;
 import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule;

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

@@ -0,0 +1,68 @@
+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;
+
+/**
+ * A {@link FactoryBean} for creating {@link ApolloDataSource} instance.
+ *
+ * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
+ * @see ApolloDataSource
+ */
+public class ApolloDataSourceFactoryBean implements FactoryBean<ApolloDataSource> {
+
+	private String namespaceName;
+	private String flowRulesKey;
+	private String defaultFlowRuleValue;
+	private Converter converter;
+
+	@Override
+	public ApolloDataSource getObject() throws Exception {
+		return new ApolloDataSource(namespaceName, flowRulesKey, defaultFlowRuleValue,
+				converter);
+	}
+
+	@Override
+	public Class<?> getObjectType() {
+		return ApolloDataSource.class;
+	}
+
+	@Override
+	public boolean isSingleton() {
+		return true;
+	}
+
+	public String getNamespaceName() {
+		return namespaceName;
+	}
+
+	public void setNamespaceName(String namespaceName) {
+		this.namespaceName = namespaceName;
+	}
+
+	public String getFlowRulesKey() {
+		return flowRulesKey;
+	}
+
+	public void setFlowRulesKey(String flowRulesKey) {
+		this.flowRulesKey = flowRulesKey;
+	}
+
+	public String getDefaultFlowRuleValue() {
+		return defaultFlowRuleValue;
+	}
+
+	public void setDefaultFlowRuleValue(String defaultFlowRuleValue) {
+		this.defaultFlowRuleValue = defaultFlowRuleValue;
+	}
+
+	public Converter getConverter() {
+		return converter;
+	}
+
+	public void setConverter(Converter converter) {
+		this.converter = converter;
+	}
+}

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

@@ -0,0 +1,81 @@
+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;
+
+/**
+ * A {@link FactoryBean} for creating {@link FileRefreshableDataSource} instance.
+ *
+ * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
+ * @see FileRefreshableDataSource
+ */
+public class FileRefreshableDataSourceFactoryBean
+		implements FactoryBean<FileRefreshableDataSource> {
+
+	private String file;
+	private String charset;
+	private long recommendRefreshMs;
+	private int bufSize;
+	private Converter converter;
+
+	@Override
+	public FileRefreshableDataSource getObject() throws Exception {
+		return new FileRefreshableDataSource(new File(file), converter,
+				recommendRefreshMs, bufSize, Charset.forName(charset));
+	}
+
+	@Override
+	public Class<?> getObjectType() {
+		return FileRefreshableDataSource.class;
+	}
+
+	@Override
+	public boolean isSingleton() {
+		return true;
+	}
+
+	public String getFile() {
+		return file;
+	}
+
+	public void setFile(String file) {
+		this.file = file;
+	}
+
+	public String getCharset() {
+		return charset;
+	}
+
+	public void setCharset(String charset) {
+		this.charset = charset;
+	}
+
+	public long getRecommendRefreshMs() {
+		return recommendRefreshMs;
+	}
+
+	public void setRecommendRefreshMs(long recommendRefreshMs) {
+		this.recommendRefreshMs = recommendRefreshMs;
+	}
+
+	public int getBufSize() {
+		return bufSize;
+	}
+
+	public void setBufSize(int bufSize) {
+		this.bufSize = bufSize;
+	}
+
+	public Converter getConverter() {
+		return converter;
+	}
+
+	public void setConverter(Converter converter) {
+		this.converter = converter;
+	}
+}

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.datasource.factorybean;
+package com.alibaba.cloud.sentinel.datasource.factorybean;
 
 import java.util.Properties;
 

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

@@ -0,0 +1,87 @@
+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;
+
+/**
+ * A {@link FactoryBean} for creating {@link ZookeeperDataSource} instance.
+ *
+ * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
+ * @see ZookeeperDataSource
+ */
+public class ZookeeperDataSourceFactoryBean implements FactoryBean<ZookeeperDataSource> {
+
+	private String serverAddr;
+
+	private String path;
+
+	private String groupId;
+	private String dataId;
+
+	private Converter converter;
+
+	@Override
+	public ZookeeperDataSource getObject() throws Exception {
+		if (StringUtils.isNotEmpty(groupId) && StringUtils.isNotEmpty(dataId)) {
+			// the path will be /{groupId}/{dataId}
+			return new ZookeeperDataSource(serverAddr, groupId, dataId, converter);
+		}
+		else {
+			// using path directly
+			return new ZookeeperDataSource(serverAddr, path, converter);
+		}
+	}
+
+	@Override
+	public Class<?> getObjectType() {
+		return ZookeeperDataSource.class;
+	}
+
+	@Override
+	public boolean isSingleton() {
+		return true;
+	}
+
+	public String getServerAddr() {
+		return serverAddr;
+	}
+
+	public void setServerAddr(String serverAddr) {
+		this.serverAddr = serverAddr;
+	}
+
+	public String getPath() {
+		return path;
+	}
+
+	public void setPath(String path) {
+		this.path = path;
+	}
+
+	public String getGroupId() {
+		return groupId;
+	}
+
+	public void setGroupId(String groupId) {
+		this.groupId = groupId;
+	}
+
+	public String getDataId() {
+		return dataId;
+	}
+
+	public void setDataId(String dataId) {
+		this.dataId = dataId;
+	}
+
+	public Converter getConverter() {
+		return converter;
+	}
+
+	public void setConverter(Converter converter) {
+		this.converter = converter;
+	}
+}

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

@@ -1,68 +0,0 @@
-package org.springframework.cloud.alibaba.sentinel.datasource.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.
- *
- * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
- * @see ApolloDataSource
- */
-public class ApolloDataSourceFactoryBean implements FactoryBean<ApolloDataSource> {
-
-    private String namespaceName;
-    private String flowRulesKey;
-    private String defaultFlowRuleValue;
-    private Converter converter;
-
-    @Override
-    public ApolloDataSource getObject() throws Exception {
-        return new ApolloDataSource(namespaceName, flowRulesKey, defaultFlowRuleValue,
-            converter);
-    }
-
-    @Override
-    public Class<?> getObjectType() {
-        return ApolloDataSource.class;
-    }
-
-    @Override
-    public boolean isSingleton() {
-        return true;
-    }
-
-    public String getNamespaceName() {
-        return namespaceName;
-    }
-
-    public void setNamespaceName(String namespaceName) {
-        this.namespaceName = namespaceName;
-    }
-
-    public String getFlowRulesKey() {
-        return flowRulesKey;
-    }
-
-    public void setFlowRulesKey(String flowRulesKey) {
-        this.flowRulesKey = flowRulesKey;
-    }
-
-    public String getDefaultFlowRuleValue() {
-        return defaultFlowRuleValue;
-    }
-
-    public void setDefaultFlowRuleValue(String defaultFlowRuleValue) {
-        this.defaultFlowRuleValue = defaultFlowRuleValue;
-    }
-
-    public Converter getConverter() {
-        return converter;
-    }
-
-    public void setConverter(Converter converter) {
-        this.converter = converter;
-    }
-}

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

@@ -1,80 +0,0 @@
-package org.springframework.cloud.alibaba.sentinel.datasource.factorybean;
-
-import java.io.File;
-import java.nio.charset.Charset;
-
-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.
- *
- * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
- * @see FileRefreshableDataSource
- */
-public class FileRefreshableDataSourceFactoryBean implements FactoryBean<FileRefreshableDataSource> {
-
-    private String file;
-    private String charset;
-    private long recommendRefreshMs;
-    private int bufSize;
-    private Converter converter;
-
-    @Override
-    public FileRefreshableDataSource getObject() throws Exception {
-        return new FileRefreshableDataSource(new File(file), converter,
-            recommendRefreshMs, bufSize, Charset.forName(charset));
-    }
-
-    @Override
-    public Class<?> getObjectType() {
-        return FileRefreshableDataSource.class;
-    }
-
-    @Override
-    public boolean isSingleton() {
-        return true;
-    }
-
-    public String getFile() {
-        return file;
-    }
-
-    public void setFile(String file) {
-        this.file = file;
-    }
-
-    public String getCharset() {
-        return charset;
-    }
-
-    public void setCharset(String charset) {
-        this.charset = charset;
-    }
-
-    public long getRecommendRefreshMs() {
-        return recommendRefreshMs;
-    }
-
-    public void setRecommendRefreshMs(long recommendRefreshMs) {
-        this.recommendRefreshMs = recommendRefreshMs;
-    }
-
-    public int getBufSize() {
-        return bufSize;
-    }
-
-    public void setBufSize(int bufSize) {
-        this.bufSize = bufSize;
-    }
-
-    public Converter getConverter() {
-        return converter;
-    }
-
-    public void setConverter(Converter converter) {
-        this.converter = converter;
-    }
-}

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

@@ -1,86 +0,0 @@
-package org.springframework.cloud.alibaba.sentinel.datasource.factorybean;
-
-import com.alibaba.csp.sentinel.datasource.Converter;
-import com.alibaba.csp.sentinel.datasource.zookeeper.ZookeeperDataSource;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.FactoryBean;
-
-/**
- * A {@link FactoryBean} for creating {@link ZookeeperDataSource} instance.
- *
- * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
- * @see ZookeeperDataSource
- */
-public class ZookeeperDataSourceFactoryBean implements FactoryBean<ZookeeperDataSource> {
-
-    private String serverAddr;
-
-    private String path;
-
-    private String groupId;
-    private String dataId;
-
-    private Converter converter;
-
-    @Override
-    public ZookeeperDataSource getObject() throws Exception {
-        if (StringUtils.isNotEmpty(groupId) && StringUtils.isNotEmpty(dataId)) {
-            // the path will be /{groupId}/{dataId}
-            return new ZookeeperDataSource(serverAddr, groupId, dataId, converter);
-        } else {
-            // using path directly
-            return new ZookeeperDataSource(serverAddr, path, converter);
-        }
-    }
-
-    @Override
-    public Class<?> getObjectType() {
-        return ZookeeperDataSource.class;
-    }
-
-    @Override
-    public boolean isSingleton() {
-        return true;
-    }
-
-    public String getServerAddr() {
-        return serverAddr;
-    }
-
-    public void setServerAddr(String serverAddr) {
-        this.serverAddr = serverAddr;
-    }
-
-    public String getPath() {
-        return path;
-    }
-
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    public String getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(String groupId) {
-        this.groupId = groupId;
-    }
-
-    public String getDataId() {
-        return dataId;
-    }
-
-    public void setDataId(String dataId) {
-        this.dataId = dataId;
-    }
-
-    public Converter getConverter() {
-        return converter;
-    }
-
-    public void setConverter(Converter converter) {
-        this.converter = converter;
-    }
-}