study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

fixes #150

Browse Source
This commit is contained in:
fangjian0423 2018-12-11 17:11:22 +08:00
parent 62c0326090
commit 098b103166
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelAutoConfiguration.java
View File

@ -21,7 +21,6 @@ import java.util.Optional;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@ -156,26 +155,22 @@ public class SentinelAutoConfiguration {
} }
@Bean("sentinel-json-converter") @Bean("sentinel-json-converter")
public JsonConverter jsonConverter( public JsonConverter jsonConverter() {
@Qualifier("sentinel-object-mapper") ObjectMapper objectMapper) { return new JsonConverter(objectMapper());
return new JsonConverter(objectMapper);
} }
@Bean("sentinel-object-mapper") private ObjectMapper objectMapper() {
public ObjectMapper objectMapper() {
return new ObjectMapper(); return new ObjectMapper();
} }
@ConditionalOnClass(XmlMapper.class) @ConditionalOnClass(XmlMapper.class)
protected static class SentinelXmlConfiguration { protected static class SentinelXmlConfiguration {
@Bean("sentinel-xml-converter") @Bean("sentinel-xml-converter")
public XmlConverter xmlConverter( public XmlConverter xmlConverter() {
@Qualifier("sentinel-xml-mapper") XmlMapper xmlMapper) { return new XmlConverter(xmlMapper());
return new XmlConverter(xmlMapper);
} }
@Bean("sentinel-xml-mapper") private XmlMapper xmlMapper() {
public XmlMapper xmlMapper() {
return new XmlMapper(); return new XmlMapper();
} }
} }