upgrade nacos-client version to 1.4.1 (#7676)
diff --git a/dubbo-configcenter/dubbo-configcenter-nacos/src/main/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfiguration.java b/dubbo-configcenter/dubbo-configcenter-nacos/src/main/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfiguration.java
index 310310f..797fb7d 100644
--- a/dubbo-configcenter/dubbo-configcenter-nacos/src/main/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfiguration.java
+++ b/dubbo-configcenter/dubbo-configcenter-nacos/src/main/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfiguration.java
@@ -36,11 +36,10 @@
import com.alibaba.nacos.api.config.listener.AbstractSharedListener;
import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.client.config.http.HttpAgent;
-import com.alibaba.nacos.client.config.impl.HttpSimpleClient;
+import com.alibaba.nacos.common.http.HttpRestResult;
-import java.io.IOException;
import java.lang.reflect.Field;
-import java.util.List;
+import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
@@ -56,8 +55,7 @@
import static com.alibaba.nacos.api.PropertyKeyConst.NAMING_LOAD_CACHE_AT_START;
import static com.alibaba.nacos.api.PropertyKeyConst.SERVER_ADDR;
import static com.alibaba.nacos.client.naming.utils.UtilAndComs.NACOS_NAMING_LOG_NAME;
-import static java.util.Arrays.asList;
-import static java.util.Collections.emptyList;
+import static java.util.Collections.emptyMap;
import static org.apache.dubbo.common.constants.RemotingConstants.BACKUP_KEY;
import static org.apache.dubbo.common.utils.StringConstantFieldValuePredicate.of;
import static org.apache.dubbo.common.utils.StringUtils.HYPHEN_CHAR;
@@ -260,18 +258,20 @@
// TODO use Nacos Client API to replace HTTP Open API
SortedSet<String> keys = new TreeSet<>();
try {
- List<String> paramsValues = asList(
- "search", "accurate",
- "dataId", "",
- "group", resolveGroup(group),
- "pageNo", "1",
- "pageSize", String.valueOf(Integer.MAX_VALUE)
- );
+
+ Map<String, String> paramsValues = new HashMap<>();
+ paramsValues.put("search", "accurate");
+ paramsValues.put("dataId", "");
+ paramsValues.put("group", resolveGroup(group));
+ paramsValues.put("pageNo", "1");
+ paramsValues.put("pageSize", String.valueOf(Integer.MAX_VALUE));
+
String encoding = getProperty(ENCODE, "UTF-8");
- HttpSimpleClient.HttpResult result = httpAgent.httpGet(GET_CONFIG_KEYS_PATH, emptyList(), paramsValues, encoding, 5 * 1000);
- Stream<String> keysStream = toKeysStream(result.content);
+
+ HttpRestResult<String> result = httpAgent.httpGet(GET_CONFIG_KEYS_PATH, emptyMap(), paramsValues, encoding, 5 * 1000);
+ Stream<String> keysStream = toKeysStream(result.getData());
keysStream.forEach(keys::add);
- } catch (IOException e) {
+ } catch (Exception e) {
if (logger.isErrorEnabled()) {
logger.error(e.getMessage(), e);
}
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index eb8be9d..8c8d757 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -130,7 +130,7 @@
<resteasy_version>3.0.19.Final</resteasy_version>
<tomcat_embed_version>8.5.31</tomcat_embed_version>
<jetcd_version>0.5.3</jetcd_version>
- <nacos_version>1.3.1</nacos_version>
+ <nacos_version>1.4.1</nacos_version>
<grpc.version>1.31.1</grpc.version>
<!-- Log libs -->
<slf4j_version>1.7.25</slf4j_version>
