argList = new ArrayList<>();
+ for (Class argClazz : args) {
+ argList.add(argClazz.getSimpleName());
+ }
+ String argsStr = Arrays.toString(argList.toArray());
+ Method foundMethod = ClassUtils.getStaticMethod(blockClass, blockMethod, args);
+ if (foundMethod == null) {
+ log.error(
+ "{} static method can not be found in bean[{}]. The right method signature is {}#{}{}, please check your class name, method name and arguments",
+ type, beanName, blockClass.getName(), blockMethod, argsStr);
+ throw new IllegalArgumentException(type
+ + " static method can not be found in bean[" + beanName
+ + "]. The right method signature is " + blockClass.getName() + "#"
+ + blockMethod + argsStr
+ + ", please check your class name, method name and arguments");
+ }
+
+ if (!ClientHttpResponse.class.isAssignableFrom(foundMethod.getReturnType())) {
+ log.error(
+ "{} method return value in bean[{}] is not ClientHttpResponse: {}#{}{}",
+ type, beanName, blockClass.getName(), blockMethod, argsStr);
+ throw new IllegalArgumentException(type + " method return value in bean["
+ + beanName + "] is not ClientHttpResponse: " + blockClass.getName()
+ + "#" + blockMethod + argsStr);
+ }
+ if (type.equals(SentinelConstants.BLOCK_TYPE)) {
+ BlockClassRegistry.updateBlockHandlerFor(blockClass, blockMethod,
+ foundMethod);
+ }
+ else {
+ BlockClassRegistry.updateFallbackFor(blockClass, blockMethod, foundMethod);
+ }
+ }
+
private boolean checkSentinelProtect(RootBeanDefinition beanDefinition,
Class beanType) {
return beanType == RestTemplate.class
- && beanDefinition.getSource() instanceof StandardMethodMetadata
+ && (checkStandardMethodMetadata(beanDefinition)
+ || checkMethodMetadataReadingVisitor(beanDefinition));
+ }
+
+ private boolean checkStandardMethodMetadata(RootBeanDefinition beanDefinition) {
+ return beanDefinition.getSource() instanceof StandardMethodMetadata
&& ((StandardMethodMetadata) beanDefinition.getSource())
.isAnnotated(SentinelRestTemplate.class.getName());
}
+ private boolean checkMethodMetadataReadingVisitor(RootBeanDefinition beanDefinition) {
+ return beanDefinition.getSource() instanceof MethodMetadataReadingVisitor
+ && ((MethodMetadataReadingVisitor) beanDefinition.getSource())
+ .isAnnotated(SentinelRestTemplate.class.getName());
+ }
+
+ @Override
+ public Object postProcessBeforeInitialization(Object o, String s)
+ throws BeansException {
+ return o;
+ }
+
@Override
public Object postProcessAfterInitialization(Object bean, String beanName)
throws BeansException {
@@ -84,7 +195,7 @@ public class SentinelBeanPostProcessor implements MergedBeanDefinitionPostProces
SentinelProtectInterceptor sentinelProtectInterceptor = applicationContext
.getBean(interceptorBeanName.toString(),
SentinelProtectInterceptor.class);
- restTemplate.getInterceptors().add(sentinelProtectInterceptor);
+ restTemplate.getInterceptors().add(0, sentinelProtectInterceptor);
}
return bean;
}
@@ -103,10 +214,4 @@ public class SentinelBeanPostProcessor implements MergedBeanDefinitionPostProces
interceptorBeanDefinition);
}
- @Override
- public Object postProcessBeforeInitialization(Object bean, String beanName)
- throws BeansException {
- return bean;
- }
-
}
\ No newline at end of file
diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelCircuitBreakerConfiguration.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelCircuitBreakerConfiguration.java
new file mode 100644
index 00000000..a13acf8a
--- /dev/null
+++ b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelCircuitBreakerConfiguration.java
@@ -0,0 +1,28 @@
+/*
+ * 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.custom;
+
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author lengleng
+ *
+ * support @EnableCircuitBreaker ,Do nothing
+ */
+@Configuration
+public class SentinelCircuitBreakerConfiguration {
+}
diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelDataSourceHandler.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelDataSourceHandler.java
index 8489c7d8..9e79ec48 100644
--- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelDataSourceHandler.java
+++ b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelDataSourceHandler.java
@@ -17,47 +17,29 @@
package org.springframework.cloud.alibaba.sentinel.custom;
import java.lang.reflect.Field;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.TreeMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.SmartInitializingSingleton;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.boot.context.event.ApplicationReadyEvent;
-import org.springframework.cloud.alibaba.sentinel.SentinelConstants;
import org.springframework.cloud.alibaba.sentinel.SentinelProperties;
-import org.springframework.cloud.alibaba.sentinel.datasource.SentinelDataSourceConstants;
import org.springframework.cloud.alibaba.sentinel.datasource.config.AbstractDataSourceProperties;
import org.springframework.cloud.alibaba.sentinel.datasource.config.DataSourcePropertiesConfiguration;
-import org.springframework.cloud.alibaba.sentinel.datasource.config.NacosDataSourceProperties;
import org.springframework.cloud.alibaba.sentinel.datasource.converter.JsonConverter;
import org.springframework.cloud.alibaba.sentinel.datasource.converter.XmlConverter;
-import org.springframework.context.event.EventListener;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ReflectionUtils;
import org.springframework.util.StringUtils;
import com.alibaba.csp.sentinel.datasource.AbstractDataSource;
import com.alibaba.csp.sentinel.datasource.ReadableDataSource;
-import com.alibaba.csp.sentinel.property.SentinelProperty;
import com.alibaba.csp.sentinel.slots.block.AbstractRule;
-import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRule;
-import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRuleManager;
-import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule;
-import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRuleManager;
-import com.alibaba.csp.sentinel.slots.block.flow.FlowRule;
-import com.alibaba.csp.sentinel.slots.block.flow.FlowRuleManager;
-import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowRule;
-import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowRuleManager;
-import com.alibaba.csp.sentinel.slots.system.SystemRule;
-import com.alibaba.csp.sentinel.slots.system.SystemRuleManager;
/**
* Sentinel {@link ReadableDataSource} Handler Handle the configurations of
@@ -68,113 +50,53 @@ import com.alibaba.csp.sentinel.slots.system.SystemRuleManager;
* @see JsonConverter
* @see XmlConverter
*/
-public class SentinelDataSourceHandler {
+public class SentinelDataSourceHandler implements SmartInitializingSingleton {
- private static final Logger logger = LoggerFactory
+ private static final Logger log = LoggerFactory
.getLogger(SentinelDataSourceHandler.class);
private List dataTypeList = Arrays.asList("json", "xml");
- private List> rulesList = Arrays.asList(FlowRule.class,
- DegradeRule.class, SystemRule.class, AuthorityRule.class,
- ParamFlowRule.class);
+ private final String DATA_TYPE_FIELD = "dataType";
+ private final String CUSTOM_DATA_TYPE = "custom";
+ private final String CONVERTER_CLASS_FIELD = "converterClass";
- private List dataSourceBeanNameList = Collections
- .synchronizedList(new ArrayList());
+ private final DefaultListableBeanFactory beanFactory;
- private final String DATATYPE_FIELD = "dataType";
- private final String CUSTOM_DATATYPE = "custom";
- private final String CONVERTERCLASS_FIELD = "converterClass";
+ public SentinelDataSourceHandler(DefaultListableBeanFactory beanFactory) {
+ this.beanFactory = beanFactory;
+ }
@Autowired
private SentinelProperties sentinelProperties;
- @EventListener(classes = ApplicationReadyEvent.class)
- public void buildDataSource(ApplicationReadyEvent event) throws Exception {
-
- DefaultListableBeanFactory beanFactory = (DefaultListableBeanFactory) event
- .getApplicationContext().getAutowireCapableBeanFactory();
-
- // commercialization
- if (!StringUtils.isEmpty(System.getProperties()
- .getProperty(SentinelDataSourceConstants.NACOS_DATASOURCE_ENDPOINT))) {
- Map newDataSourceMap = new TreeMap<>(
- String.CASE_INSENSITIVE_ORDER);
- for (Map.Entry entry : sentinelProperties
- .getDatasource().entrySet()) {
- if (entry.getValue().getValidDataSourceProperties()
- .getClass() != NacosDataSourceProperties.class) {
- newDataSourceMap.put(entry.getKey(), entry.getValue());
- }
- }
- newDataSourceMap.put(SentinelConstants.FLOW_DATASOURCE_NAME,
- new DataSourcePropertiesConfiguration(
- NacosDataSourceProperties.buildFlowByEDAS()));
- newDataSourceMap.put(SentinelConstants.DEGRADE_DATASOURCE_NAME,
- new DataSourcePropertiesConfiguration(
- NacosDataSourceProperties.buildDegradeByEDAS()));
- sentinelProperties.setDatasource(newDataSourceMap);
- }
-
- for (Map.Entry entry : sentinelProperties
- .getDatasource().entrySet()) {
- String dataSourceName = entry.getKey();
- DataSourcePropertiesConfiguration dataSourceProperties = entry.getValue();
-
- List validFields = dataSourceProperties.getValidField();
- if (validFields.size() != 1) {
- logger.error("[Sentinel Starter] DataSource " + dataSourceName
- + " multi datasource active and won't loaded: "
- + dataSourceProperties.getValidField());
- return;
- }
-
- AbstractDataSourceProperties abstractDataSourceProperties = dataSourceProperties
- .getValidDataSourceProperties();
- abstractDataSourceProperties.preCheck();
- registerBean(beanFactory, abstractDataSourceProperties,
- dataSourceName + "-sentinel-" + validFields.get(0) + "-datasource");
-
- }
-
- for (String beanName : dataSourceBeanNameList) {
- ReadableDataSource dataSource = beanFactory.getBean(beanName,
- ReadableDataSource.class);
- Object ruleConfig;
+ @Override
+ public void afterSingletonsInstantiated() {
+ for (String dataSourceName : sentinelProperties.getDatasource().keySet()) {
+ DataSourcePropertiesConfiguration dataSourceProperties = sentinelProperties
+ .getDatasource().get(dataSourceName);
try {
- logger.info("[Sentinel Starter] DataSource " + beanName
- + " start to loadConfig");
- ruleConfig = dataSource.loadConfig();
+ List validFields = dataSourceProperties.getValidField();
+ if (validFields.size() != 1) {
+ log.error("[Sentinel Starter] DataSource " + dataSourceName
+ + " multi datasource active and won't loaded: "
+ + dataSourceProperties.getValidField());
+ return;
+ }
+ AbstractDataSourceProperties abstractDataSourceProperties = dataSourceProperties
+ .getValidDataSourceProperties();
+ abstractDataSourceProperties.preCheck(dataSourceName);
+ registerBean(abstractDataSourceProperties, dataSourceName + "-sentinel-"
+ + validFields.get(0) + "-datasource");
}
catch (Exception e) {
- logger.error("[Sentinel Starter] DataSource " + beanName
- + " loadConfig error: " + e.getMessage(), e);
- return;
- }
- SentinelProperty sentinelProperty = dataSource.getProperty();
- Class ruleType = getAndCheckRuleType(ruleConfig, beanName);
- if (ruleType != null) {
- if (ruleType == FlowRule.class) {
- FlowRuleManager.register2Property(sentinelProperty);
- }
- else if (ruleType == DegradeRule.class) {
- DegradeRuleManager.register2Property(sentinelProperty);
- }
- else if (ruleType == SystemRule.class) {
- SystemRuleManager.register2Property(sentinelProperty);
- }
- else if (ruleType == AuthorityRule.class) {
- AuthorityRuleManager.register2Property(sentinelProperty);
- }
- else {
- ParamFlowRuleManager.register2Property(sentinelProperty);
- }
+ log.error("[Sentinel Starter] DataSource " + dataSourceName
+ + " build error: " + e.getMessage(), e);
}
}
}
- private void registerBean(DefaultListableBeanFactory beanFactory,
- final AbstractDataSourceProperties dataSourceProperties,
+ private void registerBean(final AbstractDataSourceProperties dataSourceProperties,
String dataSourceName) {
Map propertyMap = new HashMap<>();
@@ -187,15 +109,16 @@ public class SentinelDataSourceHandler {
}
}
catch (IllegalAccessException e) {
- logger.error("[Sentinel Starter] DataSource " + dataSourceName
- + " field: " + field.getName() + " invoke error");
+ log.error("[Sentinel Starter] DataSource " + dataSourceName + " field: "
+ + field.getName() + " invoke error");
throw new RuntimeException("[Sentinel Starter] DataSource "
+ dataSourceName + " field: " + field.getName() + " invoke error",
e);
}
}
- propertyMap.put(CONVERTERCLASS_FIELD, dataSourceProperties.getConverterClass());
- propertyMap.put(DATATYPE_FIELD, dataSourceProperties.getDataType());
+
+ propertyMap.put(CONVERTER_CLASS_FIELD, dataSourceProperties.getConverterClass());
+ propertyMap.put(DATA_TYPE_FIELD, dataSourceProperties.getDataType());
BeanDefinitionBuilder builder = BeanDefinitionBuilder
.genericBeanDefinition(dataSourceProperties.getFactoryBeanName());
@@ -205,166 +128,136 @@ public class SentinelDataSourceHandler {
Object propertyValue = entry.getValue();
Field field = ReflectionUtils.findField(dataSourceProperties.getClass(),
propertyName);
- if (field != null) {
- if (DATATYPE_FIELD.equals(propertyName)) {
- String dataType = StringUtils
- .trimAllWhitespace(propertyValue.toString());
- if (CUSTOM_DATATYPE.equals(dataType)) {
- try {
- if (StringUtils
- .isEmpty(dataSourceProperties.getConverterClass())) {
- throw new RuntimeException(
- "[Sentinel Starter] DataSource " + dataSourceName
- + "dataType is custom, please set converter-class "
- + "property");
- }
- // construct custom Converter with 'converterClass'
- // configuration and register
- String customConvertBeanName = "sentinel-"
- + dataSourceProperties.getConverterClass();
- if (!beanFactory.containsBean(customConvertBeanName)) {
- beanFactory.registerBeanDefinition(customConvertBeanName,
- BeanDefinitionBuilder
- .genericBeanDefinition(
- Class.forName(dataSourceProperties
- .getConverterClass()))
- .getBeanDefinition());
- }
- builder.addPropertyReference("converter",
- customConvertBeanName);
- }
- catch (ClassNotFoundException e) {
- logger.error("[Sentinel Starter] DataSource " + dataSourceName
- + " handle "
- + dataSourceProperties.getClass().getSimpleName()
- + " error, class name: "
- + dataSourceProperties.getConverterClass());
- throw new RuntimeException(
- "[Sentinel Starter] DataSource " + dataSourceName
- + " handle "
- + dataSourceProperties.getClass()
- .getSimpleName()
- + " error, class name: "
- + dataSourceProperties.getConverterClass(),
- e);
- }
- }
- else {
- if (!dataTypeList.contains(StringUtils
- .trimAllWhitespace(propertyValue.toString()))) {
+ if (null == field) {
+ continue;
+ }
+ if (DATA_TYPE_FIELD.equals(propertyName)) {
+ String dataType = StringUtils.trimAllWhitespace(propertyValue.toString());
+ if (CUSTOM_DATA_TYPE.equals(dataType)) {
+ try {
+ if (StringUtils
+ .isEmpty(dataSourceProperties.getConverterClass())) {
throw new RuntimeException("[Sentinel Starter] DataSource "
- + dataSourceName + " dataType: " + propertyValue
- + " is not support now. please using these types: "
- + dataTypeList.toString());
+ + dataSourceName
+ + "dataType is custom, please set converter-class "
+ + "property");
}
- // converter type now support xml or json.
- // The bean name of these converters wrapped by
- // 'sentinel-{converterType}-converter'
- builder.addPropertyReference("converter",
- "sentinel-" + propertyValue.toString() + "-converter");
+ // construct custom Converter with 'converterClass'
+ // configuration and register
+ String customConvertBeanName = "sentinel-"
+ + dataSourceProperties.getConverterClass();
+ if (!this.beanFactory.containsBean(customConvertBeanName)) {
+ this.beanFactory.registerBeanDefinition(customConvertBeanName,
+ BeanDefinitionBuilder
+ .genericBeanDefinition(
+ Class.forName(dataSourceProperties
+ .getConverterClass()))
+ .getBeanDefinition());
+ }
+ builder.addPropertyReference("converter", customConvertBeanName);
+ }
+ catch (ClassNotFoundException e) {
+ log.error("[Sentinel Starter] DataSource " + dataSourceName
+ + " handle "
+ + dataSourceProperties.getClass().getSimpleName()
+ + " error, class name: "
+ + dataSourceProperties.getConverterClass());
+ throw new RuntimeException("[Sentinel Starter] DataSource "
+ + dataSourceName + " handle "
+ + dataSourceProperties.getClass().getSimpleName()
+ + " error, class name: "
+ + dataSourceProperties.getConverterClass(), e);
}
}
- else if (CONVERTERCLASS_FIELD.equals(propertyName)) {
- continue;
- }
else {
- // wired properties
- if (propertyValue != null) {
- builder.addPropertyValue(propertyName, propertyValue);
+ if (!dataTypeList.contains(
+ StringUtils.trimAllWhitespace(propertyValue.toString()))) {
+ throw new RuntimeException("[Sentinel Starter] DataSource "
+ + dataSourceName + " dataType: " + propertyValue
+ + " is not support now. please using these types: "
+ + dataTypeList.toString());
}
+ // converter type now support xml or json.
+ // The bean name of these converters wrapped by
+ // 'sentinel-{converterType}-{ruleType}-converter'
+ builder.addPropertyReference("converter",
+ "sentinel-" + propertyValue.toString() + "-"
+ + dataSourceProperties.getRuleType().getName()
+ + "-converter");
}
}
- }
-
- beanFactory.registerBeanDefinition(dataSourceName, builder.getBeanDefinition());
- // init in Spring
- AbstractDataSource newDataSource = (AbstractDataSource) beanFactory
- .getBean(dataSourceName);
- // commercialization
- if (!StringUtils.isEmpty(System.getProperties()
- .getProperty(SentinelDataSourceConstants.NACOS_DATASOURCE_ENDPOINT))) {
- if (dataSourceName.contains(SentinelConstants.FLOW_DATASOURCE_NAME)) {
- FlowRuleManager.register2Property(newDataSource.getProperty());
- }
- else if (dataSourceName.contains(SentinelConstants.DEGRADE_DATASOURCE_NAME)) {
- DegradeRuleManager.register2Property(newDataSource.getProperty());
- }
- }
- dataSourceBeanNameList.add(dataSourceName);
- }
-
- private Class getAndCheckRuleType(Object ruleConfig, String dataSourceName) {
- if (rulesList.contains(ruleConfig.getClass())) {
- logger.info("[Sentinel Starter] DataSource {} load {} {}", dataSourceName, 1,
- ruleConfig.getClass().getSimpleName());
- return ruleConfig.getClass();
- }
- else if (ruleConfig instanceof List) {
- List convertedRuleList = (List) ruleConfig;
- if (CollectionUtils.isEmpty(convertedRuleList)) {
- logger.warn("[Sentinel Starter] DataSource {} rule list is empty.",
- dataSourceName);
- return null;
- }
-
- if (checkRuleTypeValid(convertedRuleList)) {
- if (checkAllRuleTypeSame(convertedRuleList)) {
- logger.info("[Sentinel Starter] DataSource {} load {} {}",
- dataSourceName, convertedRuleList.size(),
- convertedRuleList.get(0).getClass().getSimpleName());
- return convertedRuleList.get(0).getClass();
- }
- else {
- logger.warn(
- "[Sentinel Starter] DataSource {} all rules are not same rule type and it will not be used. "
- + "Rule List: {}",
- dataSourceName, convertedRuleList.toString());
- }
+ else if (CONVERTER_CLASS_FIELD.equals(propertyName)) {
+ continue;
}
else {
- List classList = new ArrayList<>();
- for (Object rule : convertedRuleList) {
- classList.add(rule.getClass());
+ // wired properties
+ if (propertyValue != null) {
+ builder.addPropertyValue(propertyName, propertyValue);
}
- logger.error("[Sentinel Starter] DataSource " + dataSourceName
- + " rule class is invalid. Class List: " + classList);
- throw new RuntimeException(
- "[Sentinel Starter] DataSource " + dataSourceName
- + " rule class is invalid. Class List: " + classList);
+ }
+ }
+
+ this.beanFactory.registerBeanDefinition(dataSourceName,
+ builder.getBeanDefinition());
+ // init in Spring
+ AbstractDataSource newDataSource = (AbstractDataSource) this.beanFactory
+ .getBean(dataSourceName);
+
+ logAndCheckRuleType(newDataSource, dataSourceName,
+ dataSourceProperties.getRuleType().getClazz());
+
+ // register property in RuleManager
+ dataSourceProperties.postRegister(newDataSource);
+ }
+
+ private void logAndCheckRuleType(AbstractDataSource dataSource, String dataSourceName,
+ Class ruleClass) {
+ Object ruleConfig;
+ try {
+ ruleConfig = dataSource.loadConfig();
+ }
+ catch (Exception e) {
+ log.error("[Sentinel Starter] DataSource " + dataSourceName
+ + " loadConfig error: " + e.getMessage(), e);
+ return;
+ }
+ if (ruleConfig instanceof List) {
+ List convertedRuleList = (List) ruleConfig;
+ if (CollectionUtils.isEmpty(convertedRuleList)) {
+ log.warn("[Sentinel Starter] DataSource {} rule list is empty.",
+ dataSourceName);
+ return;
+ }
+ int matchCount = 0;
+ for (Object rule : convertedRuleList) {
+ if (rule.getClass() == ruleClass) {
+ matchCount++;
+ }
+ }
+ if (matchCount == 0) {
+ log.error("[Sentinel Starter] DataSource {} none rules are {} type.",
+ dataSourceName, ruleClass.getSimpleName());
+ throw new IllegalArgumentException("[Sentinel Starter] DataSource "
+ + dataSourceName + " none rules are " + ruleClass.getSimpleName()
+ + " type.");
+ }
+ else if (matchCount != convertedRuleList.size()) {
+ log.warn("[Sentinel Starter] DataSource {} all rules are not {} type.",
+ dataSourceName, ruleClass.getSimpleName());
+ }
+ else {
+ log.info("[Sentinel Starter] DataSource {} load {} {}", dataSourceName,
+ convertedRuleList.size(), ruleClass.getSimpleName());
}
}
else {
- logger.error("[Sentinel Starter] DataSource " + dataSourceName
- + " rule class is invalid. Class: " + ruleConfig.getClass());
- throw new RuntimeException("[Sentinel Starter] DataSource " + dataSourceName
- + " rule class is invalid. Class: " + ruleConfig.getClass());
+ log.error("[Sentinel Starter] DataSource " + dataSourceName
+ + " rule class is not List<" + ruleClass.getSimpleName()
+ + ">. Class: " + ruleConfig.getClass());
+ throw new IllegalArgumentException("[Sentinel Starter] DataSource "
+ + dataSourceName + " rule class is not List<"
+ + ruleClass.getSimpleName() + ">. Class: " + ruleConfig.getClass());
}
- return null;
- }
-
- private boolean checkRuleTypeValid(List convertedRuleList) {
- int matchCount = 0;
- for (Object rule : convertedRuleList) {
- if (rulesList.contains(rule.getClass())) {
- matchCount++;
- }
- }
- return matchCount == convertedRuleList.size();
- }
-
- private boolean checkAllRuleTypeSame(List convertedRuleList) {
- int matchCount = 0;
- for (Object rule : convertedRuleList) {
- if (rulesList.contains(rule.getClass())
- && rule.getClass() == convertedRuleList.get(0).getClass()) {
- matchCount++;
- }
- }
- return matchCount == convertedRuleList.size();
- }
-
- public List getDataSourceBeanNameList() {
- return dataSourceBeanNameList;
}
}
diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelProtectInterceptor.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelProtectInterceptor.java
index a1ab9e22..f41601ab 100644
--- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelProtectInterceptor.java
+++ b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelProtectInterceptor.java
@@ -17,19 +17,16 @@
package org.springframework.cloud.alibaba.sentinel.custom;
import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.URI;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.cloud.alibaba.sentinel.annotation.SentinelRestTemplate;
import org.springframework.cloud.alibaba.sentinel.rest.SentinelClientHttpResponse;
import org.springframework.http.HttpRequest;
import org.springframework.http.client.ClientHttpRequestExecution;
import org.springframework.http.client.ClientHttpRequestInterceptor;
import org.springframework.http.client.ClientHttpResponse;
-import org.springframework.util.ClassUtils;
import com.alibaba.csp.sentinel.Entry;
import com.alibaba.csp.sentinel.SphU;
@@ -37,19 +34,15 @@ import com.alibaba.csp.sentinel.Tracer;
import com.alibaba.csp.sentinel.context.ContextUtil;
import com.alibaba.csp.sentinel.slots.block.BlockException;
import com.alibaba.csp.sentinel.slots.block.degrade.DegradeException;
-import com.alibaba.csp.sentinel.util.StringUtil;
/**
* Interceptor using by SentinelRestTemplate
*
- * @author fangjian
+ * @author Jim
*/
public class SentinelProtectInterceptor implements ClientHttpRequestInterceptor {
- private static final Logger logger = LoggerFactory
- .getLogger(SentinelProtectInterceptor.class);
-
- private SentinelRestTemplate sentinelRestTemplate;
+ private final SentinelRestTemplate sentinelRestTemplate;
public SentinelProtectInterceptor(SentinelRestTemplate sentinelRestTemplate) {
this.sentinelRestTemplate = sentinelRestTemplate;
@@ -82,18 +75,7 @@ public class SentinelProtectInterceptor implements ClientHttpRequestInterceptor
throw new IllegalStateException(e);
}
else {
- try {
- return handleBlockException(request, body, execution,
- (BlockException) e);
- }
- catch (Exception ex) {
- if (ex instanceof IllegalStateException) {
- throw (IllegalStateException) ex;
- }
- throw new IllegalStateException(
- "sentinel handle BlockException error: " + ex.getMessage(),
- ex);
- }
+ return handleBlockException(request, body, execution, (BlockException) e);
}
}
finally {
@@ -109,84 +91,49 @@ public class SentinelProtectInterceptor implements ClientHttpRequestInterceptor
}
private ClientHttpResponse handleBlockException(HttpRequest request, byte[] body,
- ClientHttpRequestExecution execution, BlockException ex) throws Exception {
+ ClientHttpRequestExecution execution, BlockException ex) {
Object[] args = new Object[] { request, body, execution, ex };
// handle degrade
if (isDegradeFailure(ex)) {
- Method method = extractFallbackMethod(sentinelRestTemplate.fallback(),
+ Method fallbackMethod = extractFallbackMethod(sentinelRestTemplate.fallback(),
sentinelRestTemplate.fallbackClass());
- if (method != null) {
- return (ClientHttpResponse) method.invoke(null, args);
+ if (fallbackMethod != null) {
+ return methodInvoke(fallbackMethod, args);
}
else {
return new SentinelClientHttpResponse();
}
}
- // handle block
+ // handle flow
Method blockHandler = extractBlockHandlerMethod(
sentinelRestTemplate.blockHandler(),
sentinelRestTemplate.blockHandlerClass());
if (blockHandler != null) {
- return (ClientHttpResponse) blockHandler.invoke(null, args);
+ return methodInvoke(blockHandler, args);
}
else {
return new SentinelClientHttpResponse();
}
}
+ private ClientHttpResponse methodInvoke(Method method, Object... args) {
+ try {
+ return (ClientHttpResponse) method.invoke(null, args);
+ }
+ catch (IllegalAccessException e) {
+ throw new RuntimeException(e);
+ }
+ catch (InvocationTargetException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
private Method extractFallbackMethod(String fallback, Class fallbackClass) {
- if (StringUtil.isBlank(fallback) || fallbackClass == void.class) {
- return null;
- }
- Method cachedMethod = BlockClassRegistry.lookupFallback(fallbackClass, fallback);
- Class[] args = new Class[] { HttpRequest.class, byte[].class,
- ClientHttpRequestExecution.class, BlockException.class };
- if (cachedMethod == null) {
- cachedMethod = ClassUtils.getStaticMethod(fallbackClass, fallback, args);
- if (cachedMethod != null) {
- if (!ClientHttpResponse.class
- .isAssignableFrom(cachedMethod.getReturnType())) {
- throw new IllegalStateException(String.format(
- "the return type of method [%s] in class [%s] is not ClientHttpResponse in degrade",
- cachedMethod.getName(), fallbackClass.getCanonicalName()));
- }
- BlockClassRegistry.updateFallbackFor(fallbackClass, fallback,
- cachedMethod);
- }
- else {
- throw new IllegalStateException(String.format(
- "Cannot find method [%s] in class [%s] with parameters %s in degrade",
- fallback, fallbackClass.getCanonicalName(), Arrays.asList(args)));
- }
- }
- return cachedMethod;
+ return BlockClassRegistry.lookupFallback(fallbackClass, fallback);
}
private Method extractBlockHandlerMethod(String block, Class blockClass) {
- if (StringUtil.isBlank(block) || blockClass == void.class) {
- return null;
- }
- Method cachedMethod = BlockClassRegistry.lookupBlockHandler(blockClass, block);
- Class[] args = new Class[] { HttpRequest.class, byte[].class,
- ClientHttpRequestExecution.class, BlockException.class };
- if (cachedMethod == null) {
- cachedMethod = ClassUtils.getStaticMethod(blockClass, block, args);
- if (cachedMethod != null) {
- if (!ClientHttpResponse.class
- .isAssignableFrom(cachedMethod.getReturnType())) {
- throw new IllegalStateException(String.format(
- "the return type of method [%s] in class [%s] is not ClientHttpResponse in flow control",
- cachedMethod.getName(), blockClass.getCanonicalName()));
- }
- BlockClassRegistry.updateBlockHandlerFor(blockClass, block, cachedMethod);
- }
- else {
- throw new IllegalStateException(String.format(
- "Cannot find method [%s] in class [%s] with parameters %s in flow control",
- block, blockClass.getCanonicalName(), Arrays.asList(args)));
- }
- }
- return cachedMethod;
+ return BlockClassRegistry.lookupBlockHandler(blockClass, block);
}
private boolean isDegradeFailure(BlockException ex) {
diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpoint.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpoint.java
index d7e3e9da..cbd8d044 100644
--- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpoint.java
+++ b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpoint.java
@@ -17,24 +17,20 @@
package org.springframework.cloud.alibaba.sentinel.endpoint;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.actuate.endpoint.AbstractEndpoint;
import org.springframework.cloud.alibaba.sentinel.SentinelProperties;
-import org.springframework.cloud.alibaba.sentinel.custom.SentinelDataSourceHandler;
-import org.springframework.context.ApplicationContext;
-import com.alibaba.csp.sentinel.datasource.ReadableDataSource;
-import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule;
+import com.alibaba.csp.sentinel.adapter.servlet.config.WebServletConfig;
+import com.alibaba.csp.sentinel.config.SentinelConfig;
+import com.alibaba.csp.sentinel.log.LogBase;
+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.FlowRule;
import com.alibaba.csp.sentinel.slots.block.flow.FlowRuleManager;
-import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowRule;
import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowRuleManager;
-import com.alibaba.csp.sentinel.slots.system.SystemRule;
import com.alibaba.csp.sentinel.slots.system.SystemRuleManager;
+import com.alibaba.csp.sentinel.transport.config.TransportConfig;
/**
* Endpoint for Sentinel, contains ans properties and rules
@@ -42,45 +38,39 @@ import com.alibaba.csp.sentinel.slots.system.SystemRuleManager;
*/
public class SentinelEndpoint extends AbstractEndpoint> {
- @Autowired
- private SentinelProperties sentinelProperties;
+ private final SentinelProperties sentinelProperties;
- @Autowired
- private SentinelDataSourceHandler dataSourceHandler;
-
- @Autowired
- private ApplicationContext applicationContext;
-
- public SentinelEndpoint() {
+ public SentinelEndpoint(SentinelProperties sentinelProperties) {
super("sentinel");
+ this.sentinelProperties = sentinelProperties;
}
@Override
public Map invoke() {
- Map result = new HashMap<>();
+ final Map result = new HashMap<>();
+ if (sentinelProperties.isEnabled()) {
- List flowRules = FlowRuleManager.getRules();
- List degradeRules = DegradeRuleManager.getRules();
- List systemRules = SystemRuleManager.getRules();
- List paramFlowRules = ParamFlowRuleManager.getRules();
- result.put("properties", sentinelProperties);
- result.put("FlowRules", flowRules);
- result.put("DegradeRules", degradeRules);
- result.put("SystemRules", systemRules);
- result.put("ParamFlowRule", paramFlowRules);
- result.put("datasources", new HashMap());
+ result.put("logDir", LogBase.getLogBaseDir());
+ result.put("logUsePid", LogBase.isLogNameUsePid());
+ result.put("blockPage", WebServletConfig.getBlockPage());
+ result.put("metricsFileSize", SentinelConfig.singleMetricFileSize());
+ result.put("metricsFileCharset", SentinelConfig.charset());
+ result.put("totalMetricsFileCount", SentinelConfig.totalMetricFileCount());
+ result.put("consoleServer", TransportConfig.getConsoleServer());
+ result.put("clientIp", TransportConfig.getHeartbeatClientIp());
+ result.put("heartbeatIntervalMs", TransportConfig.getHeartbeatIntervalMs());
+ result.put("clientPort", TransportConfig.getPort());
+ result.put("coldFactor", sentinelProperties.getFlow().getColdFactor());
+ result.put("filter", sentinelProperties.getFilter());
+ result.put("datasource", sentinelProperties.getDatasource());
- for (String dataSourceBeanName : dataSourceHandler.getDataSourceBeanNameList()) {
- ReadableDataSource dataSource = applicationContext.getBean(dataSourceBeanName,
- ReadableDataSource.class);
- try {
- ((HashMap) result.get("datasources")).put(dataSourceBeanName,
- dataSource.loadConfig());
- }
- catch (Exception e) {
- ((HashMap) result.get("datasources")).put(dataSourceBeanName,
- "load error: " + e.getMessage());
- }
+ final Map rules = new HashMap<>();
+ result.put("rules", rules);
+ rules.put("flowRules", FlowRuleManager.getRules());
+ rules.put("degradeRules", DegradeRuleManager.getRules());
+ rules.put("systemRules", SystemRuleManager.getRules());
+ rules.put("authorityRule", AuthorityRuleManager.getRules());
+ rules.put("paramFlowRule", ParamFlowRuleManager.getRules());
}
return result;
}
diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpointAutoConfiguration.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpointAutoConfiguration.java
index 728347b4..b49fb20e 100644
--- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpointAutoConfiguration.java
+++ b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpointAutoConfiguration.java
@@ -34,8 +34,8 @@ public class SentinelEndpointAutoConfiguration {
@Bean
@ConditionalOnMissingBean
@ConditionalOnEnabledEndpoint("sentinel")
- public SentinelEndpoint sentinelEndPoint() {
- return new SentinelEndpoint();
+ public SentinelEndpoint sentinelEndPoint(SentinelProperties sentinelProperties) {
+ return new SentinelEndpoint(sentinelProperties);
}
}
diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/rest/SentinelClientHttpResponse.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/rest/SentinelClientHttpResponse.java
index 6de453d4..78282a19 100644
--- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/rest/SentinelClientHttpResponse.java
+++ b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/rest/SentinelClientHttpResponse.java
@@ -16,13 +16,6 @@
package org.springframework.cloud.alibaba.sentinel.rest;
-import org.springframework.cloud.alibaba.sentinel.annotation.SentinelRestTemplate;
-import org.springframework.cloud.alibaba.sentinel.custom.SentinelProtectInterceptor;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.client.AbstractClientHttpResponse;
-
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -31,6 +24,13 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.springframework.cloud.alibaba.sentinel.annotation.SentinelRestTemplate;
+import org.springframework.cloud.alibaba.sentinel.custom.SentinelProtectInterceptor;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.client.AbstractClientHttpResponse;
+
/**
* Using by {@link SentinelRestTemplate} and {@link SentinelProtectInterceptor}
*
@@ -41,7 +41,6 @@ public class SentinelClientHttpResponse extends AbstractClientHttpResponse {
private String blockResponse = "RestTemplate request block by sentinel";
public SentinelClientHttpResponse() {
-
}
public SentinelClientHttpResponse(String blockResponse) {
diff --git a/spring-cloud-alibaba-sentinel/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-cloud-alibaba-sentinel/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index d05b0863..b445fc6a 100644
--- a/spring-cloud-alibaba-sentinel/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-cloud-alibaba-sentinel/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -18,6 +18,11 @@
"defaultValue": "8719",
"description": "sentinel api port."
},
+ {
+ "name": "spring.cloud.sentinel.transport.clientIp",
+ "type": "java.lang.String",
+ "description": "sentinel client ip connect to dashboard."
+ },
{
"name": "spring.cloud.sentinel.transport.dashboard",
"type": "java.lang.String",
diff --git a/spring-cloud-alibaba-sentinel/src/main/resources/META-INF/spring.factories b/spring-cloud-alibaba-sentinel/src/main/resources/META-INF/spring.factories
index 702bb5bb..181c30b8 100644
--- a/spring-cloud-alibaba-sentinel/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-alibaba-sentinel/src/main/resources/META-INF/spring.factories
@@ -3,3 +3,6 @@ org.springframework.cloud.alibaba.sentinel.SentinelWebAutoConfiguration,\
org.springframework.cloud.alibaba.sentinel.endpoint.SentinelEndpointAutoConfiguration,\
org.springframework.cloud.alibaba.sentinel.custom.SentinelAutoConfiguration,\
org.springframework.cloud.alibaba.sentinel.feign.SentinelFeignAutoConfiguration
+
+org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker=\
+org.springframework.cloud.alibaba.sentinel.custom.SentinelCircuitBreakerConfiguration
\ No newline at end of file
diff --git a/spring-cloud-alibaba-sentinel/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelAutoConfigurationTests.java b/spring-cloud-alibaba-sentinel/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelAutoConfigurationTests.java
index eaa682ca..65fe21ce 100644
--- a/spring-cloud-alibaba-sentinel/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelAutoConfigurationTests.java
+++ b/spring-cloud-alibaba-sentinel/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelAutoConfigurationTests.java
@@ -27,8 +27,12 @@ import org.springframework.cloud.alibaba.sentinel.annotation.SentinelRestTemplat
import org.springframework.cloud.alibaba.sentinel.custom.SentinelAutoConfiguration;
import org.springframework.cloud.alibaba.sentinel.custom.SentinelBeanPostProcessor;
import org.springframework.cloud.alibaba.sentinel.custom.SentinelProtectInterceptor;
+import org.springframework.cloud.alibaba.sentinel.rest.SentinelClientHttpResponse;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpRequest;
+import org.springframework.http.client.ClientHttpRequestExecution;
+import org.springframework.http.client.ClientHttpResponse;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
@@ -109,8 +113,9 @@ public class SentinelAutoConfigurationTests {
}
static class ExceptionUtil {
- public static void handleException(BlockException ex) {
- System.out.println("Oops: " + ex.getClass().getCanonicalName());
+ public static ClientHttpResponse handleException(HttpRequest request, byte[] body,
+ ClientHttpRequestExecution execution, BlockException ex) {
+ return new SentinelClientHttpResponse("custom block info");
}
}
diff --git a/spring-cloud-alicloud-acm/pom.xml b/spring-cloud-alicloud-acm/pom.xml
index 6b57a4f7..49012835 100644
--- a/spring-cloud-alicloud-acm/pom.xml
+++ b/spring-cloud-alicloud-acm/pom.xml
@@ -11,6 +11,7 @@
spring-cloud-alicloud-acm
+ Spring Cloud Alibaba Cloud ACM
@@ -43,6 +44,7 @@
org.springframework.boot
spring-boot-starter-actuator
+ provided
true
diff --git a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/bootstrap/AcmPropertySource.java b/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/bootstrap/AcmPropertySource.java
index 3ebae277..fb7b58ad 100644
--- a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/bootstrap/AcmPropertySource.java
+++ b/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/bootstrap/AcmPropertySource.java
@@ -27,29 +27,29 @@ import java.util.Map;
*/
public class AcmPropertySource extends MapPropertySource {
- private final String dataId;
+ private final String dataId;
- private final Date timestamp;
+ private final Date timestamp;
- private final boolean groupLevel;
+ private final boolean groupLevel;
- AcmPropertySource(String dataId, Map source, Date timestamp,
- boolean groupLevel) {
- super(dataId, source);
- this.dataId = dataId;
- this.timestamp = timestamp;
- this.groupLevel = groupLevel;
- }
+ AcmPropertySource(String dataId, Map source, Date timestamp,
+ boolean groupLevel) {
+ super(dataId, source);
+ this.dataId = dataId;
+ this.timestamp = timestamp;
+ this.groupLevel = groupLevel;
+ }
- public String getDataId() {
- return dataId;
- }
+ public String getDataId() {
+ return dataId;
+ }
- public Date getTimestamp() {
- return timestamp;
- }
+ public Date getTimestamp() {
+ return timestamp;
+ }
- public boolean isGroupLevel() {
- return groupLevel;
- }
+ public boolean isGroupLevel() {
+ return groupLevel;
+ }
}
diff --git a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/bootstrap/AcmPropertySourceBuilder.java b/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/bootstrap/AcmPropertySourceBuilder.java
index 2bf9cbba..7afabd83 100644
--- a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/bootstrap/AcmPropertySourceBuilder.java
+++ b/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/bootstrap/AcmPropertySourceBuilder.java
@@ -33,64 +33,68 @@ import java.util.*;
*/
class AcmPropertySourceBuilder {
- private Logger logger = LoggerFactory.getLogger(AcmPropertySourceBuilder.class);
+ private Logger log = LoggerFactory.getLogger(AcmPropertySourceBuilder.class);
- /**
- * 传入 ACM 的 DataId 和 groupID，获取到解析后的 AcmProperty 对象
- *
- * @param dataId
- * @param diamondGroup
- * @param groupLevel
- * @return
- */
- AcmPropertySource build(String dataId, String diamondGroup, boolean groupLevel) {
- Properties properties = loadDiamondData(dataId, diamondGroup);
- if (properties == null) {
- return null;
- }
- return new AcmPropertySource(dataId, toMap(properties), new Date(), groupLevel);
- }
+ /**
+ * 传入 ACM 的 DataId 和 groupID，获取到解析后的 AcmProperty 对象
+ *
+ * @param dataId
+ * @param diamondGroup
+ * @param groupLevel
+ * @return
+ */
+ AcmPropertySource build(String dataId, String diamondGroup, boolean groupLevel) {
+ Properties properties = loadDiamondData(dataId, diamondGroup);
+ if (properties == null) {
+ return null;
+ }
+ return new AcmPropertySource(dataId, toMap(properties), new Date(), groupLevel);
+ }
- private Properties loadDiamondData(String dataId, String diamondGroup) {
- try {
- String data = ConfigService.getConfig(dataId, diamondGroup, 3000L);
- if (StringUtils.isEmpty(data)) {
- return null;
- }
- if (dataId.endsWith(".properties")) {
- Properties properties = new Properties();
- logger.info(String.format("Loading acm data, dataId: '%s', group: '%s'",
- dataId, diamondGroup));
- properties.load(new StringReader(data));
- return properties;
- } else if (dataId.endsWith(".yaml") || dataId.endsWith(".yml")) {
- YamlPropertiesFactoryBean yamlFactory = new YamlPropertiesFactoryBean();
- yamlFactory.setResources(new ByteArrayResource(data.getBytes()));
- return yamlFactory.getObject();
- }
- } catch (Exception e) {
- if (e instanceof ConfigException) {
- logger.error("DIAMOND-100500:" + dataId + ", " + e.toString(), e);
- } else {
- logger.error("DIAMOND-100500:" + dataId, e);
- }
- }
- return null;
- }
+ private Properties loadDiamondData(String dataId, String diamondGroup) {
+ try {
+ String data = ConfigService.getConfig(dataId, diamondGroup, 3000L);
+ if (StringUtils.isEmpty(data)) {
+ return null;
+ }
+ if (dataId.endsWith(".properties")) {
+ Properties properties = new Properties();
+ log.info(String.format("Loading acm data, dataId: '%s', group: '%s'",
+ dataId, diamondGroup));
+ properties.load(new StringReader(data));
+ return properties;
+ }
+ else if (dataId.endsWith(".yaml") || dataId.endsWith(".yml")) {
+ YamlPropertiesFactoryBean yamlFactory = new YamlPropertiesFactoryBean();
+ yamlFactory.setResources(new ByteArrayResource(data.getBytes()));
+ return yamlFactory.getObject();
+ }
+ }
+ catch (Exception e) {
+ if (e instanceof ConfigException) {
+ log.error("DIAMOND-100500:" + dataId + ", " + e.toString(), e);
+ }
+ else {
+ log.error("DIAMOND-100500:" + dataId, e);
+ }
+ }
+ return null;
+ }
- @SuppressWarnings("unchecked")
- private Map toMap(Properties properties) {
- Map result = new HashMap<>();
- Enumeration keys = (Enumeration)properties.propertyNames();
- while (keys.hasMoreElements()) {
- String key = keys.nextElement();
- Object value = properties.getProperty(key);
- if (value != null) {
- result.put(key, ((String)value).trim());
- } else {
- result.put(key, null);
- }
- }
- return result;
- }
+ @SuppressWarnings("unchecked")
+ private Map toMap(Properties properties) {
+ Map result = new HashMap<>();
+ Enumeration keys = (Enumeration) properties.propertyNames();
+ while (keys.hasMoreElements()) {
+ String key = keys.nextElement();
+ Object value = properties.getProperty(key);
+ if (value != null) {
+ result.put(key, ((String) value).trim());
+ }
+ else {
+ result.put(key, null);
+ }
+ }
+ return result;
+ }
}
diff --git a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/endpoint/AcmHealthIndicator.java b/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/endpoint/AcmHealthIndicator.java
index 27569ec1..c6052ae1 100644
--- a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/endpoint/AcmHealthIndicator.java
+++ b/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/endpoint/AcmHealthIndicator.java
@@ -33,39 +33,40 @@ import java.util.List;
*/
public class AcmHealthIndicator extends AbstractHealthIndicator {
- private final AcmProperties acmProperties;
+ private final AcmProperties acmProperties;
- private final AcmPropertySourceRepository acmPropertySourceRepository;
+ private final AcmPropertySourceRepository acmPropertySourceRepository;
- private final List dataIds;
+ private final List dataIds;
- public AcmHealthIndicator(AcmProperties acmProperties,
- AcmPropertySourceRepository acmPropertySourceRepository) {
- this.acmProperties = acmProperties;
- this.acmPropertySourceRepository = acmPropertySourceRepository;
+ public AcmHealthIndicator(AcmProperties acmProperties,
+ AcmPropertySourceRepository acmPropertySourceRepository) {
+ this.acmProperties = acmProperties;
+ this.acmPropertySourceRepository = acmPropertySourceRepository;
- this.dataIds = new ArrayList<>();
- for (AcmPropertySource acmPropertySource : this.acmPropertySourceRepository
- .getAll()) {
- this.dataIds.add(acmPropertySource.getDataId());
- }
- }
+ this.dataIds = new ArrayList<>();
+ for (AcmPropertySource acmPropertySource : this.acmPropertySourceRepository
+ .getAll()) {
+ this.dataIds.add(acmPropertySource.getDataId());
+ }
+ }
- @Override
- protected void doHealthCheck(Health.Builder builder) throws Exception {
- for (String dataId : dataIds) {
- try {
- String config = ConfigService.getConfig(dataId, acmProperties.getGroup(),
- acmProperties.getTimeout());
- if (StringUtils.isEmpty(config)) {
- builder.down().withDetail(String.format("dataId: '%s', group: '%s'",
- dataId, acmProperties.getGroup()), "config is empty");
- }
- } catch (Exception e) {
- builder.down().withDetail(String.format("dataId: '%s', group: '%s'",
- dataId, acmProperties.getGroup()), e.getMessage());
- }
- }
- builder.up().withDetail("dataIds", dataIds);
- }
+ @Override
+ protected void doHealthCheck(Health.Builder builder) throws Exception {
+ for (String dataId : dataIds) {
+ try {
+ String config = ConfigService.getConfig(dataId, acmProperties.getGroup(),
+ acmProperties.getTimeout());
+ if (StringUtils.isEmpty(config)) {
+ builder.down().withDetail(String.format("dataId: '%s', group: '%s'",
+ dataId, acmProperties.getGroup()), "config is empty");
+ }
+ }
+ catch (Exception e) {
+ builder.down().withDetail(String.format("dataId: '%s', group: '%s'",
+ dataId, acmProperties.getGroup()), e.getMessage());
+ }
+ }
+ builder.up().withDetail("dataIds", dataIds);
+ }
}
diff --git a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/refresh/AcmContextRefresher.java b/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/refresh/AcmContextRefresher.java
index 58457c07..18308b59 100644
--- a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/refresh/AcmContextRefresher.java
+++ b/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/refresh/AcmContextRefresher.java
@@ -28,7 +28,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.cloud.alicloud.acm.AcmPropertySourceRepository;
-import org.springframework.cloud.alicloud.acm.bootstrap.AcmPropertySource;
import org.springframework.cloud.alicloud.context.acm.AcmIntegrationProperties;
import org.springframework.cloud.context.refresh.ContextRefresher;
import org.springframework.cloud.endpoint.event.RefreshEvent;
@@ -50,7 +49,7 @@ import com.alibaba.edas.acm.listener.ConfigChangeListener;
public class AcmContextRefresher
implements ApplicationListener, ApplicationContextAware {
- private Logger logger = LoggerFactory.getLogger(AcmContextRefresher.class);
+ private Logger log = LoggerFactory.getLogger(AcmContextRefresher.class);
private final ContextRefresher contextRefresher;
@@ -103,7 +102,7 @@ public class AcmContextRefresher
}
catch (NoSuchAlgorithmException
| UnsupportedEncodingException e) {
- logger.warn("unable to get md5 for dataId: " + dataId, e);
+ log.warn("unable to get md5 for dataId: " + dataId, e);
}
}
refreshHistory.add(dataId, md5);
diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/AnsAutoConfiguration.java b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/AnsAutoConfiguration.java
index 144520fc..4a39ded0 100644
--- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/AnsAutoConfiguration.java
+++ b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/AnsAutoConfiguration.java
@@ -16,6 +16,7 @@
package org.springframework.cloud.alicloud.ans;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -26,7 +27,7 @@ import org.springframework.cloud.alicloud.ans.registry.AnsAutoServiceRegistratio
import org.springframework.cloud.alicloud.ans.registry.AnsRegistration;
import org.springframework.cloud.alicloud.ans.registry.AnsServiceRegistry;
import org.springframework.cloud.alicloud.context.ans.AnsProperties;
-import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationAutoConfiguration;
+import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationProperties;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
@@ -42,8 +43,8 @@ import org.springframework.context.annotation.Configuration;
@ConditionalOnClass(name = "org.springframework.boot.context.embedded.EmbeddedServletContainerInitializedEvent")
@ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", matchIfMissing = true)
@ConditionalOnAnsEnabled
-@AutoConfigureBefore({ AutoServiceRegistrationAutoConfiguration.class,
- AnsDiscoveryClientAutoConfiguration.class })
+@AutoConfigureBefore(AnsDiscoveryClientAutoConfiguration.class)
+@AutoConfigureAfter(AutoServiceRegistrationConfiguration.class)
public class AnsAutoConfiguration {
@Bean
diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/endpoint/AnsEndpoint.java b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/endpoint/AnsEndpoint.java
index 7a35ef6f..056bd878 100644
--- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/endpoint/AnsEndpoint.java
+++ b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/endpoint/AnsEndpoint.java
@@ -18,8 +18,8 @@ package org.springframework.cloud.alicloud.ans.endpoint;
import com.alibaba.ans.core.NamingService;
import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.boot.actuate.endpoint.AbstractEndpoint;
import org.springframework.cloud.alicloud.context.ans.AnsProperties;
@@ -34,7 +34,7 @@ import java.util.Set;
*/
public class AnsEndpoint extends AbstractEndpoint> {
- private static final Log log = LogFactory.getLog(AnsEndpoint.class);
+ private static final Logger log = LoggerFactory.getLogger(AnsEndpoint.class);
private AnsProperties ansProperties;
diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateEndpoint.java b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateEndpoint.java
index 53d559a1..e8609648 100644
--- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateEndpoint.java
+++ b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateEndpoint.java
@@ -1,7 +1,7 @@
package org.springframework.cloud.alicloud.ans.migrate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.boot.actuate.endpoint.AbstractEndpoint;
import java.util.Map;
@@ -13,7 +13,7 @@ import java.util.concurrent.ConcurrentMap;
public class MigrateEndpoint
extends AbstractEndpoint>> {
- private static final Log log = LogFactory.getLog(MigrateEndpoint.class);
+ private static final Logger log = LoggerFactory.getLogger(MigrateEndpoint.class);
public MigrateEndpoint() {
super("migrate");
diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateOnConditionClass.java b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateOnConditionClass.java
index 391173d2..9e99c9f8 100644
--- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateOnConditionClass.java
+++ b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateOnConditionClass.java
@@ -1,7 +1,7 @@
package org.springframework.cloud.alicloud.ans.migrate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.ConditionContext;
import org.springframework.core.type.AnnotatedTypeMetadata;
@@ -10,7 +10,8 @@ import org.springframework.core.type.AnnotatedTypeMetadata;
*/
public class MigrateOnConditionClass extends MigrateOnCondition {
- protected static final Log log = LogFactory.getLog(MigrateOnConditionClass.class);
+ private static final Logger log = LoggerFactory
+ .getLogger(MigrateOnConditionClass.class);
@Override
public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateOnConditionMissingClass.java b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateOnConditionMissingClass.java
index da19cb3a..b5653bb7 100644
--- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateOnConditionMissingClass.java
+++ b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateOnConditionMissingClass.java
@@ -1,7 +1,7 @@
package org.springframework.cloud.alicloud.ans.migrate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.ConditionContext;
import org.springframework.core.type.AnnotatedTypeMetadata;
@@ -9,8 +9,8 @@ import org.springframework.core.type.AnnotatedTypeMetadata;
* @author pbting
*/
public class MigrateOnConditionMissingClass extends MigrateOnConditionClass {
- protected static final Log log = LogFactory
- .getLog(MigrateOnConditionMissingClass.class);
+ private static final Logger log = LoggerFactory
+ .getLogger(MigrateOnConditionMissingClass.class);
@Override
public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateProxyManager.java b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateProxyManager.java
index 06f673fb..8b62c22e 100644
--- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateProxyManager.java
+++ b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateProxyManager.java
@@ -7,8 +7,8 @@ import com.netflix.loadbalancer.ServerList;
import org.aopalliance.aop.Advice;
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.aop.framework.ProxyFactory;
import java.util.*;
@@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
*/
final class MigrateProxyManager {
- private final static Log log = LogFactory.getLog(MigrateProxyManager.class);
+ private static final Logger log = LoggerFactory.getLogger(MigrateProxyManager.class);
private final static AtomicBoolean IS_PROXY = new AtomicBoolean(true);
diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateRefreshEventListener.java b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateRefreshEventListener.java
index f5144972..db941c84 100644
--- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateRefreshEventListener.java
+++ b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateRefreshEventListener.java
@@ -7,8 +7,8 @@ import java.util.concurrent.TimeUnit;
import javax.annotation.PostConstruct;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.cloud.context.named.NamedContextFactory;
import org.springframework.cloud.endpoint.event.RefreshEvent;
import org.springframework.context.ApplicationListener;
@@ -22,7 +22,8 @@ import com.netflix.loadbalancer.ILoadBalancer;
*/
@Component
public class MigrateRefreshEventListener implements ApplicationListener {
- private final static Log log = LogFactory.getLog(MigrateRefreshEventListener.class);
+ private static final Logger log = LoggerFactory
+ .getLogger(MigrateRefreshEventListener.class);
private final static int CHECK_INTERVAL = 1;
diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateRibbonBeanPostProcessor.java b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateRibbonBeanPostProcessor.java
index df246f18..74fa658a 100644
--- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateRibbonBeanPostProcessor.java
+++ b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateRibbonBeanPostProcessor.java
@@ -1,7 +1,7 @@
package org.springframework.cloud.alicloud.ans.migrate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.beans.factory.config.BeanPostProcessor;
@@ -16,7 +16,7 @@ import com.netflix.loadbalancer.ServerList;
public class MigrateRibbonBeanPostProcessor
implements BeanPostProcessor, BeanClassLoaderAware {
- protected static final Log log = LogFactory.getLog(MigrateOnCondition.class);
+ private static final Logger log = LoggerFactory.getLogger(MigrateOnCondition.class);
private ClassLoader classLoader;
private IClientConfig clientConfig;
diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateServiceRegistry.java b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateServiceRegistry.java
index b6c709ca..8220d377 100644
--- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateServiceRegistry.java
+++ b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateServiceRegistry.java
@@ -2,8 +2,8 @@ package org.springframework.cloud.alicloud.ans.migrate;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.cloud.alicloud.ans.registry.AnsRegistration;
import org.springframework.cloud.alicloud.ans.registry.AnsServiceRegistry;
@@ -19,7 +19,8 @@ import org.springframework.stereotype.Component;
@Component
public class MigrateServiceRegistry {
- private static final Log log = LogFactory.getLog(MigrateServiceRegistry.class);
+ private static final Logger log = LoggerFactory
+ .getLogger(MigrateServiceRegistry.class);
private AtomicBoolean running = new AtomicBoolean(false);
diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/ServerListInvocationHandler.java b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/ServerListInvocationHandler.java
index 5d6e108f..85ca5c3c 100644
--- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/ServerListInvocationHandler.java
+++ b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/ServerListInvocationHandler.java
@@ -4,8 +4,8 @@ import com.netflix.client.config.IClientConfig;
import com.netflix.loadbalancer.Server;
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.cloud.alicloud.ans.ribbon.AnsServer;
import org.springframework.cloud.alicloud.ans.ribbon.AnsServerList;
@@ -21,7 +21,8 @@ import java.util.concurrent.atomic.AtomicLong;
*/
class ServerListInvocationHandler implements MethodInterceptor {
- private final static Log log = LogFactory.getLog(ServerListInvocationHandler.class);
+ private static final Logger log = LoggerFactory
+ .getLogger(ServerListInvocationHandler.class);
private final static ConcurrentMap SERVER_LIST_CONCURRENT_MAP = new ConcurrentHashMap<>();
diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistration.java b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistration.java
index 5ea2258c..084f85a8 100644
--- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistration.java
+++ b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistration.java
@@ -16,8 +16,8 @@
package org.springframework.cloud.alicloud.ans.registry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.boot.context.embedded.EmbeddedServletContainerInitializedEvent;
import org.springframework.cloud.client.serviceregistry.AbstractAutoServiceRegistration;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationProperties;
@@ -35,7 +35,8 @@ import org.springframework.util.StringUtils;
public class AnsAutoServiceRegistration
extends AbstractAutoServiceRegistration {
- private static final Log log = LogFactory.getLog(AnsAutoServiceRegistration.class);
+ private static final Logger log = LoggerFactory
+ .getLogger(AnsAutoServiceRegistration.class);
private AnsRegistration registration;
@@ -115,11 +116,11 @@ public class AnsAutoServiceRegistration
@Override
protected int getConfiguredPort() {
- return registration.getPort();
+ return this.getPort().get();
}
@Override
protected void setConfiguredPort(int port) {
- this.registration.setPort(port);
+ this.getPort().set(port);
}
}
diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsServiceRegistry.java b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsServiceRegistry.java
index 1ff187a3..924d2976 100644
--- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsServiceRegistry.java
+++ b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsServiceRegistry.java
@@ -19,8 +19,8 @@ package org.springframework.cloud.alicloud.ans.registry;
import com.alibaba.ans.core.NamingService;
import com.alibaba.ans.shaded.com.taobao.vipserver.client.ipms.NodeReactor;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
import java.util.ArrayList;
@@ -32,7 +32,7 @@ import java.util.Map;
*/
public class AnsServiceRegistry implements ServiceRegistry {
- private static Log log = LogFactory.getLog(AnsServiceRegistry.class);
+ private static final Logger log = LoggerFactory.getLogger(AnsServiceRegistry.class);
private static final String SEPARATOR = ",";
diff --git a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/sentinel/SentinelAliCloudListener.java b/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/sentinel/SentinelAliCloudListener.java
deleted file mode 100644
index 9e64b835..00000000
--- a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/sentinel/SentinelAliCloudListener.java
+++ /dev/null
@@ -1,64 +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.alicloud.context.sentinel;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
-import org.springframework.cloud.alicloud.context.Constants;
-import org.springframework.cloud.alicloud.context.listener.AbstractOnceApplicationListener;
-
-import com.alibaba.cloud.context.edas.EdasChangeOrderConfiguration;
-import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory;
-
-/**
- * @author Jim
- */
-public class SentinelAliCloudListener
- extends AbstractOnceApplicationListener {
-
- private static final Logger logger = LoggerFactory
- .getLogger(SentinelAliCloudListener.class);
-
- @Override
- protected void handleEvent(ApplicationEnvironmentPreparedEvent event) {
- EdasChangeOrderConfiguration edasChangeOrderConfiguration = EdasChangeOrderConfigurationFactory
- .getEdasChangeOrderConfiguration();
- logger.info("Sentinel Nacos datasource will"
- + (edasChangeOrderConfiguration.isEdasManaged() ? " be " : " not be ")
- + "changed by edas change order.");
- if (!edasChangeOrderConfiguration.isEdasManaged()) {
- return;
- }
- System.getProperties().setProperty(Constants.Sentinel.NACOS_DATASOURCE_ENDPOINT,
- edasChangeOrderConfiguration.getAddressServerDomain());
- System.getProperties().setProperty(Constants.Sentinel.NACOS_DATASOURCE_NAMESPACE,
- edasChangeOrderConfiguration.getTenantId());
- System.getProperties().setProperty(Constants.Sentinel.NACOS_DATASOURCE_AK,
- edasChangeOrderConfiguration.getDauthAccessKey());
- System.getProperties().setProperty(Constants.Sentinel.NACOS_DATASOURCE_SK,
- edasChangeOrderConfiguration.getDauthSecretKey());
- System.getProperties().setProperty(Constants.Sentinel.PROJECT_NAME,
- edasChangeOrderConfiguration.getProjectName());
- }
-
- @Override
- protected String conditionalOnClass() {
- return "com.alibaba.csp.sentinel.datasource.nacos.NacosDataSource";
- }
-
-}
diff --git a/spring-cloud-alicloud-context/src/main/resources/META-INF/spring.factories b/spring-cloud-alicloud-context/src/main/resources/META-INF/spring.factories
index b39c6499..0679da54 100644
--- a/spring-cloud-alicloud-context/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-alicloud-context/src/main/resources/META-INF/spring.factories
@@ -11,5 +11,4 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.springframework.context.ApplicationListener=\
org.springframework.cloud.alicloud.context.ans.AnsContextApplicationListener,\
org.springframework.cloud.alicloud.context.nacos.NacosConfigParameterInitListener,\
- org.springframework.cloud.alicloud.context.nacos.NacosDiscoveryParameterInitListener,\
- org.springframework.cloud.alicloud.context.sentinel.SentinelAliCloudListener
\ No newline at end of file
+ org.springframework.cloud.alicloud.context.nacos.NacosDiscoveryParameterInitListener
\ No newline at end of file
diff --git a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/sentinel/SentinelAliCloudListenerTests.java b/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/sentinel/SentinelAliCloudListenerTests.java
deleted file mode 100644
index de2a5bc0..00000000
--- a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/sentinel/SentinelAliCloudListenerTests.java
+++ /dev/null
@@ -1,56 +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.alicloud.context.sentinel;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.springframework.cloud.alicloud.context.BaseAliCloudSpringApplication;
-import org.springframework.cloud.alicloud.context.Constants;
-import org.springframework.cloud.alicloud.utils.ChangeOrderUtils;
-
-import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory;
-
-/**
- * @author xiaolongzuo
- */
-@PrepareForTest({ EdasChangeOrderConfigurationFactory.class,
- SentinelAliCloudListener.class })
-public class SentinelAliCloudListenerTests extends BaseAliCloudSpringApplication {
-
- @BeforeClass
- public static void setUp() {
- ChangeOrderUtils.mockChangeOrder();
- }
-
- @Test
- public void testNacosParameterInitListener() {
- assertThat(System.getProperty(Constants.Sentinel.NACOS_DATASOURCE_ENDPOINT))
- .isEqualTo("testDomain");
- assertThat(System.getProperty(Constants.Sentinel.PROJECT_NAME))
- .isEqualTo("testProjectName");
- assertThat(System.getProperty(Constants.Sentinel.NACOS_DATASOURCE_NAMESPACE))
- .isEqualTo("testTenantId");
- assertThat(System.getProperty(Constants.Sentinel.NACOS_DATASOURCE_AK))
- .isEqualTo("testAK");
- assertThat(System.getProperty(Constants.Sentinel.NACOS_DATASOURCE_SK))
- .isEqualTo("testSK");
-
- }
-}