From a3f9960f238a0c6a444ee0beb73d6462b6680922 Mon Sep 17 00:00:00 2001 From: fangjian0423 Date: Mon, 11 Nov 2019 14:28:42 +0800 Subject: [PATCH] sync & commit in greenwich --- .../alibaba/cloud/nacos/parser/AbstractNacosDataParser.java | 4 ++-- .../com/alibaba/cloud/nacos/parser/NacosDataJsonParser.java | 3 ++- .../com/alibaba/cloud/nacos/parser/NacosDataXmlParser.java | 3 +-- .../cloud/seata/web/SeataHandlerInterceptorConfiguration.java | 2 ++ 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/AbstractNacosDataParser.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/AbstractNacosDataParser.java index 626db91fa..0e7bc3bce 100644 --- a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/AbstractNacosDataParser.java +++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/AbstractNacosDataParser.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; -import com.alibaba.nacos.client.utils.StringUtils; +import org.springframework.util.StringUtils; /** * @author zkz @@ -118,7 +118,7 @@ public abstract class AbstractNacosDataParser { Properties properties = new Properties(); for (Map.Entry entry : map.entrySet()) { String key = entry.getKey(); - if (StringUtils.isBlank(key)) { + if (StringUtils.isEmpty(key)) { continue; } key = key.startsWith(DOT) ? key.replaceFirst("\\.", "") : key; diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/NacosDataJsonParser.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/NacosDataJsonParser.java index a4fbe3279..c29369d06 100644 --- a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/NacosDataJsonParser.java +++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/NacosDataJsonParser.java @@ -22,10 +22,11 @@ import java.util.Iterator; import java.util.Map; import java.util.Properties; -import com.alibaba.nacos.client.utils.StringUtils; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.util.StringUtils; + /** * @author zkz */ diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/NacosDataXmlParser.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/NacosDataXmlParser.java index f9e0173c6..b07942506 100644 --- a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/NacosDataXmlParser.java +++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/NacosDataXmlParser.java @@ -25,8 +25,7 @@ import java.util.Properties; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import com.alibaba.nacos.client.utils.StringUtils; - +import org.springframework.util.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; diff --git a/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptorConfiguration.java b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptorConfiguration.java index 51757bf49..efe097b17 100644 --- a/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptorConfiguration.java +++ b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptorConfiguration.java @@ -16,12 +16,14 @@ package com.alibaba.cloud.seata.web; +import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; /** * @author xiaojing */ +@ConditionalOnWebApplication public class SeataHandlerInterceptorConfiguration implements WebMvcConfigurer { @Override