Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[ISSUE#12979] Abstract client common classes to basic module. #13081

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 5, 2025
Merged

[ISSUE#12979] Abstract client common classes to basic module. #13081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
facf2d2
Abstract client common classes to basic module.
KomachiSion Feb 5, 2025
b1c3053
Use client-basic module replace maintainer-client duplicate classes.
KomachiSion Feb 5, 2025
c3aa5f6
Fix copyright problem.
KomachiSion Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 60 additions & 0 deletions client-basic/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 1999-2025 Alibaba Group Holding Ltd.
~
~ 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.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>nacos-client-basic</artifactId>
<packaging>jar</packaging>

<name>nacos-client-basic ${project.version}</name>
<url>https://nacos.io</url>
<description>Nacos client basic pom.xml file</description>

<properties>
<maven.compiler.source>${client.java.version}</maven.compiler.source>
<maven.compiler.target>${client.java.version}</maven.compiler.target>
</properties>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>nacos-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-common</artifactId>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<optional>true</optional>
</dependency>
</dependencies>

</project>
6 changes: 3 additions & 3 deletions ...nt/address/AbstractServerListManager.java → ...nt/address/AbstractServerListManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1999-2024 Alibaba Group Holding Ltd.
* Copyright 1999-2025 Alibaba Group Holding Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -20,14 +20,14 @@
import com.alibaba.nacos.api.common.Constants;
import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.client.env.NacosClientProperties;
import com.alibaba.nacos.client.utils.LogUtils;
import com.alibaba.nacos.common.JustForTest;
import com.alibaba.nacos.common.http.client.NacosRestTemplate;
import com.alibaba.nacos.common.lifecycle.Closeable;
import com.alibaba.nacos.common.remote.client.ServerListFactory;
import com.alibaba.nacos.common.spi.NacosServiceLoader;
import com.alibaba.nacos.common.utils.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.Collection;
import java.util.List;
Expand All @@ -40,7 +40,7 @@
*/
public abstract class AbstractServerListManager implements ServerListFactory, Closeable {

private static final Logger LOGGER = LogUtils.logger(AbstractServerListManager.class);
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractServerListManager.class);

protected ServerListProvider serverListProvider;

Expand Down
4 changes: 2 additions & 2 deletions ...t/address/AbstractServerListProvider.java → ...t/address/AbstractServerListProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import com.alibaba.nacos.api.PropertyKeyConst;
import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.client.env.NacosClientProperties;
import com.alibaba.nacos.client.utils.ParamUtil;
import com.alibaba.nacos.client.utils.ClientBasicParamUtil;
import com.alibaba.nacos.common.http.client.NacosRestTemplate;
import com.alibaba.nacos.common.utils.StringUtils;

Expand All @@ -32,7 +32,7 @@
*/
public abstract class AbstractServerListProvider implements ServerListProvider {

protected String contextPath = ParamUtil.getDefaultContextPath();
protected String contextPath = ClientBasicParamUtil.getDefaultContextPath();

protected String namespace = "";

Expand Down
20 changes: 11 additions & 9 deletions ...t/address/EndpointServerListProvider.java → ...t/address/EndpointServerListProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1999-2024 Alibaba Group Holding Ltd.
* Copyright 1999-2025 Alibaba Group Holding Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -22,21 +22,21 @@
import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.client.constant.Constants.Address;
import com.alibaba.nacos.client.env.NacosClientProperties;
import com.alibaba.nacos.client.naming.utils.CollectionUtils;
import com.alibaba.nacos.client.utils.ClientBasicParamUtil;
import com.alibaba.nacos.client.utils.ContextPathUtil;
import com.alibaba.nacos.client.utils.LogUtils;
import com.alibaba.nacos.client.utils.ParamUtil;
import com.alibaba.nacos.client.utils.TemplateUtils;
import com.alibaba.nacos.common.executor.NameThreadFactory;
import com.alibaba.nacos.common.http.HttpRestResult;
import com.alibaba.nacos.common.http.HttpUtils;
import com.alibaba.nacos.common.http.client.NacosRestTemplate;
import com.alibaba.nacos.common.http.param.Query;
import com.alibaba.nacos.common.notify.NotifyCenter;
import com.alibaba.nacos.common.utils.CollectionUtils;
import com.alibaba.nacos.common.utils.InternetAddressUtil;
import com.alibaba.nacos.common.utils.IoUtils;
import com.alibaba.nacos.common.utils.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.StringReader;
import java.util.ArrayList;
Expand All @@ -52,7 +52,9 @@
*/
public class EndpointServerListProvider extends AbstractServerListProvider {

private static final Logger LOGGER = LogUtils.logger(EndpointServerListProvider.class);
private static final Logger LOGGER = LoggerFactory.getLogger(EndpointServerListProvider.class);

private static final boolean USE_ENDPOINT_PARSING_RULE_DEFAULT_VALUE = true;

private NacosRestTemplate nacosRestTemplate;

Expand All @@ -72,7 +74,7 @@ public class EndpointServerListProvider extends AbstractServerListProvider {

private String endpointContextPath;

private String serverListName = ParamUtil.getDefaultNodesPath();
private String serverListName = ClientBasicParamUtil.getDefaultNodesPath();

private volatile List<String> serversFromEndpoint = new ArrayList<>();

Expand Down Expand Up @@ -127,9 +129,9 @@ private String getEndPointTmp(NacosClientProperties properties) {
String endpointTmp = properties.getProperty(PropertyKeyConst.ENDPOINT);
String isUseEndpointRuleParsing = properties.getProperty(PropertyKeyConst.IS_USE_ENDPOINT_PARSING_RULE,
properties.getProperty(SystemPropertyKeyConst.IS_USE_ENDPOINT_PARSING_RULE,
String.valueOf(ParamUtil.USE_ENDPOINT_PARSING_RULE_DEFAULT_VALUE)));
String.valueOf(USE_ENDPOINT_PARSING_RULE_DEFAULT_VALUE)));
if (Boolean.parseBoolean(isUseEndpointRuleParsing)) {
endpointTmp = ParamUtil.parsingEndpointRule(endpointTmp);
endpointTmp = ClientBasicParamUtil.parsingEndpointRule(endpointTmp);
}
return endpointTmp;
}
Expand Down Expand Up @@ -204,7 +206,7 @@ private List<String> getServerListFromEndpoint() {
String[] ipPort = InternetAddressUtil.splitIpPortStr(serverAddr);
String ip = ipPort[0].trim();
if (ipPort.length == 1) {
result.add(ip + InternetAddressUtil.IP_PORT_SPLITER + ParamUtil.getDefaultServerPort());
result.add(ip + InternetAddressUtil.IP_PORT_SPLITER + ClientBasicParamUtil.getDefaultServerPort());
} else {
result.add(serverAddr);
}
Expand Down
6 changes: 3 additions & 3 deletions ...lient/address/PropertiesListProvider.java → ...lient/address/PropertiesListProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.client.constant.Constants.Address;
import com.alibaba.nacos.client.env.NacosClientProperties;
import com.alibaba.nacos.client.utils.ParamUtil;
import com.alibaba.nacos.client.utils.ClientBasicParamUtil;
import com.alibaba.nacos.common.http.client.NacosRestTemplate;
import com.alibaba.nacos.common.utils.InternetAddressUtil;
import com.alibaba.nacos.common.utils.StringUtils;
Expand Down Expand Up @@ -57,7 +57,7 @@ public void init(final NacosClientProperties properties, final NacosRestTemplate
String[] serverAddrArr = InternetAddressUtil.splitIpPortStr(serverAddr);
if (serverAddrArr.length == 1) {
this.serverList
.add(serverAddrArr[0] + InternetAddressUtil.IP_PORT_SPLITER + ParamUtil.getDefaultServerPort());
.add(serverAddrArr[0] + InternetAddressUtil.IP_PORT_SPLITER + ClientBasicParamUtil.getDefaultServerPort());
} else {
this.serverList.add(serverAddr);
}
Expand All @@ -73,7 +73,7 @@ public List<String> getServerList() {
@Override
public String getServerName() {
return FIXED_NAME + "-" + (StringUtils.isNotBlank(namespace) ? (StringUtils.trim(namespace) + "-")
: "") + ParamUtil.getNameSuffixByServerIps(serverList.toArray(new String[0]));
: "") + ClientBasicParamUtil.getNameSuffixByServerIps(serverList.toArray(new String[0]));
}

@Override
Expand Down
0 ...client/address/ServerListChangeEvent.java → ...client/address/ServerListChangeEvent.java
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...os/client/address/ServerListProvider.java → ...os/client/address/ServerListProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1999-2024 Alibaba Group Holding Ltd.
* Copyright 1999-2025 Alibaba Group Holding Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -18,7 +18,7 @@

import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.client.env.NacosClientProperties;
import com.alibaba.nacos.client.utils.ParamUtil;
import com.alibaba.nacos.client.utils.ClientBasicParamUtil;
import com.alibaba.nacos.common.http.client.NacosRestTemplate;
import com.alibaba.nacos.common.lifecycle.Closeable;

Expand Down Expand Up @@ -66,7 +66,7 @@ default String getNamespace() {
* @return context path
*/
default String getContextPath() {
return ParamUtil.getDefaultContextPath();
return ClientBasicParamUtil.getDefaultContextPath();
}

/**
Expand Down
14 changes: 0 additions & 14 deletions ...baba/nacos/client/constant/Constants.java → ...baba/nacos/client/constant/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,6 @@ public static class SysEnv {

}

public static class Disk {

public static final String READ_ONLY = "r";

public static final String READ_WRITE = "rw";
}

public static class HealthCheck {

public static final String UP = "UP";

public static final String DOWN = "DOWN";
}

public static class Security {

public static final long SECURITY_INFO_REFRESH_INTERVAL_MILLS = TimeUnit.SECONDS.toMillis(5);
Expand Down
0 ...os/client/env/AbstractPropertySource.java → ...os/client/env/AbstractPropertySource.java
View file
Open in desktop
File renamed without changes.
0 ...cos/client/env/JvmArgsPropertySource.java → ...cos/client/env/JvmArgsPropertySource.java
View file
Open in desktop
File renamed without changes.
0 ...cos/client/env/NacosClientProperties.java → ...cos/client/env/NacosClientProperties.java
View file
Open in desktop
File renamed without changes.
0 .../client/env/PropertiesPropertySource.java → .../client/env/PropertiesPropertySource.java
View file
Open in desktop
File renamed without changes.
0 ...acos/client/env/SearchableProperties.java → ...acos/client/env/SearchableProperties.java
View file
Open in desktop
File renamed without changes.
0 .../alibaba/nacos/client/env/SourceType.java → .../alibaba/nacos/client/env/SourceType.java
View file
Open in desktop
File renamed without changes.
0 ...s/client/env/SystemEnvPropertySource.java → ...s/client/env/SystemEnvPropertySource.java
View file
Open in desktop
File renamed without changes.
0 ...nv/convert/AbstractPropertyConverter.java → ...nv/convert/AbstractPropertyConverter.java
View file
Open in desktop
File renamed without changes.
0 .../client/env/convert/BooleanConverter.java → .../client/env/convert/BooleanConverter.java
View file
Open in desktop
File renamed without changes.
0 ...lient/env/convert/CompositeConverter.java → ...lient/env/convert/CompositeConverter.java
View file
Open in desktop
File renamed without changes.
0 .../client/env/convert/IntegerConverter.java → .../client/env/convert/IntegerConverter.java
View file
Open in desktop
File renamed without changes.
0 ...cos/client/env/convert/LongConverter.java → ...cos/client/env/convert/LongConverter.java
View file
Open in desktop
File renamed without changes.
0 ...baba/nacos/client/utils/AppNameUtils.java → ...baba/nacos/client/utils/AppNameUtils.java
View file
Open in desktop
File renamed without changes.
Loading