#734 -> update pkg name

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

@@ -1,9 +1,26 @@
-package org.springframework.cloud.alibaba.sentinel.datasource;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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;
 
 import java.util.Arrays;
 import java.util.Optional;
 
-import org.springframework.cloud.alibaba.sentinel.datasource.config.AbstractDataSourceProperties;
+import com.alibaba.cloud.sentinel.datasource.config.AbstractDataSourceProperties;
 import org.springframework.util.StringUtils;
 
 import com.alibaba.csp.sentinel.slots.block.AbstractRule;

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

@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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;
+
+/**
+ * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
+ */
+public interface SentinelDataSourceConstants {
+
+	String PROPERTY_PREFIX = "spring.cloud.sentinel";
+
+}

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

@@ -0,0 +1,125 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 javax.validation.constraints.NotEmpty;
+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;
+import com.alibaba.csp.sentinel.datasource.AbstractDataSource;
+import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRuleManager;
+import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRuleManager;
+import com.alibaba.csp.sentinel.slots.block.flow.FlowRuleManager;
+import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowRuleManager;
+import com.alibaba.csp.sentinel.slots.system.SystemRuleManager;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+/**
+ * Abstract class Using by {@link DataSourcePropertiesConfiguration}
+ *
+ * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
+ */
+public class AbstractDataSourceProperties {
+
+    @NotEmpty
+    private String dataType = "json";
+    @NotNull
+    private RuleType ruleType;
+    private String converterClass;
+    @JsonIgnore
+    private final String factoryBeanName;
+    @JsonIgnore
+    private Environment env;
+
+    public AbstractDataSourceProperties(String factoryBeanName) {
+        this.factoryBeanName = factoryBeanName;
+    }
+
+    public String getDataType() {
+        return dataType;
+    }
+
+    public void setDataType(String dataType) {
+        this.dataType = dataType;
+    }
+
+    public RuleType getRuleType() {
+        return ruleType;
+    }
+
+    public void setRuleType(RuleType ruleType) {
+        this.ruleType = ruleType;
+    }
+
+    public String getConverterClass() {
+        return converterClass;
+    }
+
+    public void setConverterClass(String converterClass) {
+        this.converterClass = converterClass;
+    }
+
+    public String getFactoryBeanName() {
+        return factoryBeanName;
+    }
+
+    protected Environment getEnv() {
+        return env;
+    }
+
+    public void setEnv(Environment env) {
+        this.env = env;
+    }
+
+    public void preCheck(String dataSourceName) {
+
+    }
+
+    public void postRegister(AbstractDataSource dataSource) {
+        switch (this.getRuleType()) {
+            case FLOW:
+                FlowRuleManager.register2Property(dataSource.getProperty());
+                break;
+            case DEGRADE:
+                DegradeRuleManager.register2Property(dataSource.getProperty());
+                break;
+            case PARAM_FLOW:
+                ParamFlowRuleManager.register2Property(dataSource.getProperty());
+                break;
+            case SYSTEM:
+                SystemRuleManager.register2Property(dataSource.getProperty());
+                break;
+            case AUTHORITY:
+                AuthorityRuleManager.register2Property(dataSource.getProperty());
+                break;
+            case GW_FLOW:
+                GatewayRuleManager.register2Property(dataSource.getProperty());
+                break;
+            case GW_API_GROUP:
+                GatewayApiDefinitionManager.register2Property(dataSource.getProperty());
+                break;
+            default:
+                break;
+        }
+    }
+}

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

@@ -1,8 +1,25 @@
-package org.springframework.cloud.alibaba.sentinel.datasource.config;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 javax.validation.constraints.NotEmpty;
 
-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

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

@@ -1,4 +1,21 @@
-package org.springframework.cloud.alibaba.sentinel.datasource.config;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.util.Arrays;
 import java.util.List;

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

@@ -1,10 +1,28 @@
-package org.springframework.cloud.alibaba.sentinel.datasource.config;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.io.IOException;
 
 import javax.validation.constraints.NotEmpty;
 
-import org.springframework.cloud.alibaba.sentinel.datasource.factorybean.FileRefreshableDataSourceFactoryBean;
+import com.alibaba.cloud.sentinel.datasource.factorybean.FileRefreshableDataSourceFactoryBean;
+
 import org.springframework.util.ResourceUtils;
 import org.springframework.util.StringUtils;
 

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

@@ -1,8 +1,26 @@
-package org.springframework.cloud.alibaba.sentinel.datasource.config;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 javax.validation.constraints.NotEmpty;
 
-import org.springframework.cloud.alibaba.sentinel.datasource.factorybean.NacosDataSourceFactoryBean;
+import com.alibaba.cloud.sentinel.datasource.factorybean.NacosDataSourceFactoryBean;
+
 import org.springframework.util.StringUtils;
 
 /**

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

@@ -1,6 +1,24 @@
-package org.springframework.cloud.alibaba.sentinel.datasource.config;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 com.alibaba.cloud.sentinel.datasource.factorybean.ZookeeperDataSourceFactoryBean;
 
-import org.springframework.cloud.alibaba.sentinel.datasource.factorybean.ZookeeperDataSourceFactoryBean;
 import org.springframework.util.StringUtils;
 
 /**

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

@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.converter;
+
+import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRule;
+import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule;
+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 com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ * Convert sentinel rules for json array Using strict mode to parse json
+ *
+ * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
+ * @see FlowRule
+ * @see DegradeRule
+ * @see SystemRule
+ * @see AuthorityRule
+ * @see ParamFlowRule
+ * @see ObjectMapper
+ */
+public class JsonConverter<T> extends SentinelConverter {
+
+	public JsonConverter(ObjectMapper objectMapper, Class<T> ruleClass) {
+		super(objectMapper, ruleClass);
+	}
+
+}

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

@@ -1,4 +1,21 @@
-package org.springframework.cloud.alibaba.sentinel.datasource.converter;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.converter;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -9,9 +26,9 @@ import java.util.Optional;
 
 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;

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

@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.converter;
+
+import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRule;
+import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule;
+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 com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+
+/**
+ * Convert sentinel rules for xml array Using strict mode to parse xml
+ *
+ * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
+ * @see FlowRule
+ * @see DegradeRule
+ * @see SystemRule
+ * @see AuthorityRule
+ * @see ParamFlowRule
+ * @see ObjectMapper
+ */
+public class XmlConverter<T> extends SentinelConverter {
+
+	public XmlConverter(XmlMapper xmlMapper, Class<T> ruleClass) {
+		super(xmlMapper, ruleClass);
+	}
+
+}

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

@@ -1,4 +1,21 @@
-package org.springframework.cloud.alibaba.sentinel.datasource.factorybean;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.factorybean;
 
 import org.springframework.beans.factory.FactoryBean;
 

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

@@ -1,4 +1,21 @@
-package org.springframework.cloud.alibaba.sentinel.datasource.factorybean;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.factorybean;
 
 import java.io.File;
 import java.nio.charset.Charset;

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

@@ -1,4 +1,21 @@
-package org.springframework.cloud.alibaba.sentinel.datasource.factorybean;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.factorybean;
 
 import java.util.Properties;
 

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

@@ -1,4 +1,21 @@
-package org.springframework.cloud.alibaba.sentinel.datasource.factorybean;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.factorybean;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.FactoryBean;

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

@@ -1,26 +0,0 @@
-/*
- * 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 org.springframework.cloud.alibaba.sentinel.datasource;
-
-/**
- * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
- */
-public interface SentinelDataSourceConstants {
-
-	String PROPERTY_PREFIX = "spring.cloud.sentinel";
-
-}

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

@@ -1,108 +0,0 @@
-package org.springframework.cloud.alibaba.sentinel.datasource.config;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
-import org.springframework.cloud.alibaba.sentinel.datasource.RuleType;
-import org.springframework.core.env.Environment;
-
-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;
-import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRuleManager;
-import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRuleManager;
-import com.alibaba.csp.sentinel.slots.block.flow.FlowRuleManager;
-import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowRuleManager;
-import com.alibaba.csp.sentinel.slots.system.SystemRuleManager;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-/**
- * Abstract class Using by {@link DataSourcePropertiesConfiguration}
- *
- * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
- */
-public class AbstractDataSourceProperties {
-
-	@NotEmpty
-	private String dataType = "json";
-	@NotNull
-	private RuleType ruleType;
-	private String converterClass;
-	@JsonIgnore
-	private final String factoryBeanName;
-	@JsonIgnore
-	private Environment env;
-
-	public AbstractDataSourceProperties(String factoryBeanName) {
-		this.factoryBeanName = factoryBeanName;
-	}
-
-	public String getDataType() {
-		return dataType;
-	}
-
-	public void setDataType(String dataType) {
-		this.dataType = dataType;
-	}
-
-	public RuleType getRuleType() {
-		return ruleType;
-	}
-
-	public void setRuleType(RuleType ruleType) {
-		this.ruleType = ruleType;
-	}
-
-	public String getConverterClass() {
-		return converterClass;
-	}
-
-	public void setConverterClass(String converterClass) {
-		this.converterClass = converterClass;
-	}
-
-	public String getFactoryBeanName() {
-		return factoryBeanName;
-	}
-
-	protected Environment getEnv() {
-		return env;
-	}
-
-	public void setEnv(Environment env) {
-		this.env = env;
-	}
-
-	public void preCheck(String dataSourceName) {
-
-	}
-
-	public void postRegister(AbstractDataSource dataSource) {
-		switch (this.getRuleType()) {
-		case FLOW:
-			FlowRuleManager.register2Property(dataSource.getProperty());
-			break;
-		case DEGRADE:
-			DegradeRuleManager.register2Property(dataSource.getProperty());
-			break;
-		case PARAM_FLOW:
-			ParamFlowRuleManager.register2Property(dataSource.getProperty());
-			break;
-		case SYSTEM:
-			SystemRuleManager.register2Property(dataSource.getProperty());
-			break;
-		case AUTHORITY:
-			AuthorityRuleManager.register2Property(dataSource.getProperty());
-			break;
-		case GW_FLOW:
-			GatewayRuleManager.register2Property(dataSource.getProperty());
-			break;
-		case GW_API_GROUP:
-			GatewayApiDefinitionManager.register2Property(dataSource.getProperty());
-			break;
-		default:
-			break;
-		}
-	}
-}

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

@@ -1,28 +0,0 @@
-package org.springframework.cloud.alibaba.sentinel.datasource.converter;
-
-import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRule;
-import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule;
-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 com.fasterxml.jackson.databind.ObjectMapper;
-
-/**
- * Convert sentinel rules for json array Using strict mode to parse json
- *
- * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
- * @see FlowRule
- * @see DegradeRule
- * @see SystemRule
- * @see AuthorityRule
- * @see ParamFlowRule
- * @see ObjectMapper
- */
-public class JsonConverter<T> extends SentinelConverter {
-
-	public JsonConverter(ObjectMapper objectMapper, Class<T> ruleClass) {
-		super(objectMapper, ruleClass);
-	}
-
-}

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

@@ -1,29 +0,0 @@
-package org.springframework.cloud.alibaba.sentinel.datasource.converter;
-
-import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRule;
-import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule;
-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 com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.xml.XmlMapper;
-
-/**
- * Convert sentinel rules for xml array Using strict mode to parse xml
- *
- * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
- * @see FlowRule
- * @see DegradeRule
- * @see SystemRule
- * @see AuthorityRule
- * @see ParamFlowRule
- * @see ObjectMapper
- */
-public class XmlConverter<T> extends SentinelConverter {
-
-	public XmlConverter(XmlMapper xmlMapper, Class<T> ruleClass) {
-		super(xmlMapper, ruleClass);
-	}
-
-}

alibaba-sentinel-datasource-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/datasource/ApolloDataSourceFactoryBeanTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.datasource;
+package com.alibaba.cloud.sentinel.datasource;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.doReturn;
@@ -23,9 +23,9 @@ import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 import org.junit.Test;
-import org.springframework.cloud.alibaba.sentinel.datasource.converter.JsonConverter;
-import org.springframework.cloud.alibaba.sentinel.datasource.factorybean.ApolloDataSourceFactoryBean;
 
+import com.alibaba.cloud.sentinel.datasource.converter.JsonConverter;
+import com.alibaba.cloud.sentinel.datasource.factorybean.ApolloDataSourceFactoryBean;
 import com.alibaba.csp.sentinel.datasource.Converter;
 import com.alibaba.csp.sentinel.datasource.apollo.ApolloDataSource;
 

alibaba-sentinel-datasource-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/datasource/DataSourcePropertiesConfigurationTests.java

@@ -14,18 +14,19 @@
 // * limitations under the License.
 // */
 //
-//package org.springframework.cloud.alibaba.sentinel.datasource;
+//package com.alibaba.cloud.sentinel.datasource;
+//
+//import com.alibaba.cloud.sentinel.datasource.config.ApolloDataSourceProperties;
+//import com.alibaba.cloud.sentinel.datasource.config.DataSourcePropertiesConfiguration;
+//import com.alibaba.cloud.sentinel.datasource.config.FileDataSourceProperties;
+//import com.alibaba.cloud.sentinel.datasource.config.NacosDataSourceProperties;
+//import com.alibaba.cloud.sentinel.datasource.config.ZookeeperDataSourceProperties;
 //
 //import static org.junit.Assert.assertEquals;
 //import static org.junit.Assert.assertNotNull;
 //import static org.junit.Assert.assertNull;
 //
 //import org.junit.Test;
-//import org.springframework.cloud.alibaba.sentinel.datasource.config.ApolloDataSourceProperties;
-//import org.springframework.cloud.alibaba.sentinel.datasource.config.DataSourcePropertiesConfiguration;
-//import org.springframework.cloud.alibaba.sentinel.datasource.config.FileDataSourceProperties;
-//import org.springframework.cloud.alibaba.sentinel.datasource.config.NacosDataSourceProperties;
-//import org.springframework.cloud.alibaba.sentinel.datasource.config.ZookeeperDataSourceProperties;
 //
 ///**
 // * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>

alibaba-sentinel-datasource-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/datasource/DataSourcePropertiesTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.datasource;
+package com.alibaba.cloud.sentinel.datasource;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -25,15 +25,15 @@ import java.util.List;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Test;
-import org.springframework.cloud.alibaba.sentinel.datasource.config.ApolloDataSourceProperties;
-import org.springframework.cloud.alibaba.sentinel.datasource.config.FileDataSourceProperties;
-import org.springframework.cloud.alibaba.sentinel.datasource.config.ZookeeperDataSourceProperties;
-import org.springframework.cloud.alibaba.sentinel.datasource.factorybean.ApolloDataSourceFactoryBean;
-import org.springframework.cloud.alibaba.sentinel.datasource.factorybean.FileRefreshableDataSourceFactoryBean;
-import org.springframework.cloud.alibaba.sentinel.datasource.factorybean.ZookeeperDataSourceFactoryBean;
 import org.springframework.util.ResourceUtils;
 import org.springframework.util.StringUtils;
 
+import com.alibaba.cloud.sentinel.datasource.config.ApolloDataSourceProperties;
+import com.alibaba.cloud.sentinel.datasource.config.FileDataSourceProperties;
+import com.alibaba.cloud.sentinel.datasource.config.ZookeeperDataSourceProperties;
+import com.alibaba.cloud.sentinel.datasource.factorybean.ApolloDataSourceFactoryBean;
+import com.alibaba.cloud.sentinel.datasource.factorybean.FileRefreshableDataSourceFactoryBean;
+import com.alibaba.cloud.sentinel.datasource.factorybean.ZookeeperDataSourceFactoryBean;
 import com.alibaba.csp.sentinel.datasource.Converter;
 import com.alibaba.csp.sentinel.datasource.FileRefreshableDataSource;
 import com.alibaba.csp.sentinel.slots.block.flow.FlowRule;

alibaba-sentinel-datasource-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/datasource/FileRefreshableDataSourceFactoryBeanTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.datasource;
+package com.alibaba.cloud.sentinel.datasource;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -26,7 +26,7 @@ import java.util.List;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Test;
-import org.springframework.cloud.alibaba.sentinel.datasource.factorybean.FileRefreshableDataSourceFactoryBean;
+import com.alibaba.cloud.sentinel.datasource.factorybean.FileRefreshableDataSourceFactoryBean;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

alibaba-sentinel-datasource-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/datasource/NacosDataSourceFactoryBeanTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.datasource;
+package com.alibaba.cloud.sentinel.datasource;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.doReturn;
@@ -23,9 +23,9 @@ import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 import org.junit.Test;
-import org.springframework.cloud.alibaba.sentinel.datasource.converter.SentinelConverter;
-import org.springframework.cloud.alibaba.sentinel.datasource.factorybean.NacosDataSourceFactoryBean;
 
+import com.alibaba.cloud.sentinel.datasource.converter.SentinelConverter;
+import com.alibaba.cloud.sentinel.datasource.factorybean.NacosDataSourceFactoryBean;
 import com.alibaba.csp.sentinel.datasource.Converter;
 import com.alibaba.csp.sentinel.datasource.nacos.NacosDataSource;
 

alibaba-sentinel-datasource-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/datasource/NacosDataSourcePropertiesTests.java

@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.datasource;
+package com.alibaba.cloud.sentinel.datasource;
+
+import com.alibaba.cloud.sentinel.datasource.config.NacosDataSourceProperties;
+import com.alibaba.cloud.sentinel.datasource.factorybean.NacosDataSourceFactoryBean;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
-import org.springframework.cloud.alibaba.sentinel.datasource.config.NacosDataSourceProperties;
-import org.springframework.cloud.alibaba.sentinel.datasource.factorybean.NacosDataSourceFactoryBean;
 
 /**
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>

alibaba-sentinel-datasource-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/datasource/RuleTypeTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.datasource;
+package com.alibaba.cloud.sentinel.datasource;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;

alibaba-sentinel-datasource-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/datasource/SentinelConverterTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.datasource;
+package com.alibaba.cloud.sentinel.datasource;
 
 import static org.junit.Assert.assertEquals;
 
@@ -23,11 +23,11 @@ import java.util.List;
 
 import org.apache.commons.io.FileUtils;
 import org.junit.Test;
-import org.springframework.cloud.alibaba.sentinel.datasource.converter.JsonConverter;
-import org.springframework.cloud.alibaba.sentinel.datasource.converter.XmlConverter;
 import org.springframework.util.ResourceUtils;
 import org.springframework.util.StringUtils;
 
+import com.alibaba.cloud.sentinel.datasource.converter.JsonConverter;
+import com.alibaba.cloud.sentinel.datasource.converter.XmlConverter;
 import com.alibaba.csp.sentinel.slots.block.RuleConstant;
 import com.alibaba.csp.sentinel.slots.block.flow.FlowRule;
 

alibaba-sentinel-datasource-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/datasource/ZookeeperDataSourceFactoryBeanTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.datasource;
+package com.alibaba.cloud.sentinel.datasource;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.doReturn;
@@ -23,9 +23,9 @@ import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 import org.junit.Test;
-import org.springframework.cloud.alibaba.sentinel.datasource.converter.XmlConverter;
-import org.springframework.cloud.alibaba.sentinel.datasource.factorybean.ZookeeperDataSourceFactoryBean;
 
+import com.alibaba.cloud.sentinel.datasource.converter.XmlConverter;
+import com.alibaba.cloud.sentinel.datasource.factorybean.ZookeeperDataSourceFactoryBean;
 import com.alibaba.csp.sentinel.datasource.Converter;
 import com.alibaba.csp.sentinel.datasource.zookeeper.ZookeeperDataSource;