From 08ba076a423140fa0a724e14adf471cabfbf98c5 Mon Sep 17 00:00:00 2001 From: mengjin Date: Thu, 2 Apr 2020 18:38:36 +0800 Subject: [PATCH] :sparkles: Introducing new features. Sentinel Support ConsulDataSource Dynamic Rule Configuration fix checkstyle error --- .../datasource/config/ConsulDataSourceProperties.java | 5 +++-- .../datasource/factorybean/ConsulDataSourceFactoryBean.java | 1 + .../main/resources/META-INF/sentinel-datasource.properties | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/ConsulDataSourceProperties.java b/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/ConsulDataSourceProperties.java index 98f064f5..871ee51b 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/ConsulDataSourceProperties.java +++ b/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/ConsulDataSourceProperties.java @@ -17,6 +17,7 @@ package com.alibaba.cloud.sentinel.datasource.config; import com.alibaba.cloud.sentinel.datasource.factorybean.ConsulDataSourceFactoryBean; + import org.springframework.util.StringUtils; /** @@ -32,12 +33,12 @@ public class ConsulDataSourceProperties extends AbstractDataSourceProperties { } /** - * consul server host + * consul server host. */ private String host; /** - * consul server port + * consul server port. */ private int port=8500; diff --git a/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/ConsulDataSourceFactoryBean.java b/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/ConsulDataSourceFactoryBean.java index ad132357..a8fc172d 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/ConsulDataSourceFactoryBean.java +++ b/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/ConsulDataSourceFactoryBean.java @@ -18,6 +18,7 @@ package com.alibaba.cloud.sentinel.datasource.factorybean; import com.alibaba.csp.sentinel.datasource.Converter; import com.alibaba.csp.sentinel.datasource.consul.ConsulDataSource; + import org.springframework.beans.factory.FactoryBean; /** diff --git a/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/src/main/resources/META-INF/sentinel-datasource.properties b/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/src/main/resources/META-INF/sentinel-datasource.properties index db4df37f..e67a3b9b 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/src/main/resources/META-INF/sentinel-datasource.properties +++ b/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/src/main/resources/META-INF/sentinel-datasource.properties @@ -3,4 +3,4 @@ file =com.alibaba.csp.sentinel.datasource.FileRefreshableDataSource apollo = com.alibaba.csp.sentinel.datasource.apollo.ApolloDataSource zk = com.alibaba.csp.sentinel.datasource.zookeeper.ZookeeperDataSource redis = com.alibaba.csp.sentinel.datasource.redis.RedisDataSource -consul = com.alibaba.csp.sentinel.datasource.consul.ConsulDataSource \ No newline at end of file +consul = com.alibaba.csp.sentinel.datasource.consul.ConsulDataSource