Skip to content
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

Jump to bottom

[ISSUE #3046] Unify the treatment of constant variables and reduce the usage of "magic numbers" #7294

Closed
wants to merge 4 commits into from
Closed

[ISSUE #3046] Unify the treatment of constant variables and reduce the usage of "magic numbers" #7294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
614c8cb
modified: client/src/main/java/com/alibaba/nacos/client/naming/rem…
ArthurMograbi Nov 25, 2021
0f9791d
modified: client/src/main/java/com/alibaba/nacos/client/config/imp…
ArthurMograbi Nov 25, 2021
f862f13
modified: config/src/main/java/com/alibaba/nacos/config/server/con…
ArthurMograbi Nov 25, 2021
fa429a2
modified: client/src/main/java/com/alibaba/nacos/client/config/imp…
ArthurMograbi Nov 25, 2021
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
28 changes: 16 additions & 12 deletions client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@ public class ClientWorker implements Closeable {
/**
* groupKey -> cacheData.
*/
private final AtomicReference<Map<String, CacheData>> cacheMap = new AtomicReference<>(new HashMap<>());
private final AtomicReference<Map<String, CacheData>> cacheMap = new AtomicReference<Map<String, CacheData>>(
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why add type?

new HashMap<String, CacheData>());

private final ConfigFilterChainManager configFilterChainManager;

Expand Down Expand Up @@ -735,16 +736,19 @@ public Class<? extends Event> subscribeType() {

@Override
public void startInternal() throws NacosException {
executor.schedule(() -> {
while (!executor.isShutdown() && !executor.isTerminated()) {
try {
listenExecutebell.poll(5L, TimeUnit.SECONDS);
if (executor.isShutdown() || executor.isTerminated()) {
continue;
executor.schedule(new Runnable() {
@Override
public void run() {
while (!executor.isShutdown() && !executor.isTerminated()) {
try {
listenExecutebell.poll(5L, TimeUnit.SECONDS);
if (executor.isShutdown() || executor.isTerminated()) {
continue;
}
executeConfigListen();
} catch (Exception e) {
LOGGER.error("[ rpc listen execute ] [rpc listen] exception", e);
}
executeConfigListen();
} catch (Exception e) {
LOGGER.error("[ rpc listen execute ] [rpc listen] exception", e);
}
}
}, 0L, TimeUnit.MILLISECONDS);
Expand Down Expand Up @@ -785,7 +789,7 @@ public void executeConfigListen() {
if (!cache.isUseLocalConfigInfo()) {
List<CacheData> cacheDatas = listenCachesMap.get(String.valueOf(cache.getTaskId()));
if (cacheDatas == null) {
cacheDatas = new LinkedList<>();
cacheDatas = new LinkedList<CacheData>();
listenCachesMap.put(String.valueOf(cache.getTaskId()), cacheDatas);
}
cacheDatas.add(cache);
Expand All @@ -796,7 +800,7 @@ public void executeConfigListen() {
if (!cache.isUseLocalConfigInfo()) {
List<CacheData> cacheDatas = removeListenCachesMap.get(String.valueOf(cache.getTaskId()));
if (cacheDatas == null) {
cacheDatas = new LinkedList<>();
cacheDatas = new LinkedList<CacheData>();
removeListenCachesMap.put(String.valueOf(cache.getTaskId()), cacheDatas);
}
cacheDatas.add(cache);
Expand Down
22 changes: 11 additions & 11 deletions client/src/main/java/com/alibaba/nacos/client/naming/remote/http/NamingHttpClientProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public void registerService(String serviceName, String groupName, Instance insta
BeatInfo beatInfo = beatReactor.buildBeatInfo(groupedServiceName, instance);
beatReactor.addBeatInfo(groupedServiceName, beatInfo);
}
final Map<String, String> params = new HashMap<String, String>(32);
final Map<String, String> params = new HashMap<String, String>(16);
params.put(CommonParams.NAMESPACE_ID, namespaceId);
params.put(CommonParams.SERVICE_NAME, groupedServiceName);
params.put(CommonParams.GROUP_NAME, groupName);
Expand All @@ -175,7 +175,7 @@ public void deregisterService(String serviceName, String groupName, Instance ins
beatReactor.removeBeatInfo(NamingUtils.getGroupedName(serviceName, groupName), instance.getIp(),
instance.getPort());
}
final Map<String, String> params = new HashMap<String, String>(16);
final Map<String, String> params = new HashMap<String, String>(8);
params.put(CommonParams.NAMESPACE_ID, namespaceId);
params.put(CommonParams.SERVICE_NAME, NamingUtils.getGroupedName(serviceName, groupName));
params.put(CommonParams.CLUSTER_NAME, instance.getClusterName());
Expand All @@ -191,7 +191,7 @@ public void updateInstance(String serviceName, String groupName, Instance instan
NAMING_LOGGER
.info("[UPDATE-SERVICE] {} update service {} with instance: {}", namespaceId, serviceName, instance);

final Map<String, String> params = new HashMap<String, String>(32);
final Map<String, String> params = new HashMap<String, String>(8);
params.put(CommonParams.NAMESPACE_ID, namespaceId);
params.put(CommonParams.SERVICE_NAME, serviceName);
params.put(CommonParams.GROUP_NAME, groupName);
Expand All @@ -209,7 +209,7 @@ public void updateInstance(String serviceName, String groupName, Instance instan
@Override
public ServiceInfo queryInstancesOfService(String serviceName, String groupName, String clusters, int udpPort,
boolean healthyOnly) throws NacosException {
final Map<String, String> params = new HashMap<String, String>(16);
final Map<String, String> params = new HashMap<String, String>(8);
params.put(CommonParams.NAMESPACE_ID, namespaceId);
params.put(CommonParams.SERVICE_NAME, NamingUtils.getGroupedName(serviceName, groupName));
params.put(CLUSTERS_PARAM, clusters);
Expand All @@ -227,7 +227,7 @@ public ServiceInfo queryInstancesOfService(String serviceName, String groupName,
public Service queryService(String serviceName, String groupName) throws NacosException {
NAMING_LOGGER.info("[QUERY-SERVICE] {} query service : {}, {}", namespaceId, serviceName, groupName);

final Map<String, String> params = new HashMap<String, String>(16);
final Map<String, String> params = new HashMap<String, String>(3);
params.put(CommonParams.NAMESPACE_ID, namespaceId);
params.put(CommonParams.SERVICE_NAME, serviceName);
params.put(CommonParams.GROUP_NAME, groupName);
Expand All @@ -241,7 +241,7 @@ public void createService(Service service, AbstractSelector selector) throws Nac

NAMING_LOGGER.info("[CREATE-SERVICE] {} creating service : {}", namespaceId, service);

final Map<String, String> params = new HashMap<String, String>(16);
final Map<String, String> params = new HashMap<String, String>(6);
params.put(CommonParams.NAMESPACE_ID, namespaceId);
params.put(CommonParams.SERVICE_NAME, service.getName());
params.put(CommonParams.GROUP_NAME, service.getGroupName());
Expand All @@ -258,7 +258,7 @@ public boolean deleteService(String serviceName, String groupName) throws NacosE
NAMING_LOGGER.info("[DELETE-SERVICE] {} deleting service : {} with groupName : {}", namespaceId, serviceName,
groupName);

final Map<String, String> params = new HashMap<String, String>(16);
final Map<String, String> params = new HashMap<String, String>(6);
params.put(CommonParams.NAMESPACE_ID, namespaceId);
params.put(CommonParams.SERVICE_NAME, serviceName);
params.put(CommonParams.GROUP_NAME, groupName);
Expand All @@ -271,7 +271,7 @@ public boolean deleteService(String serviceName, String groupName) throws NacosE
public void updateService(Service service, AbstractSelector selector) throws NacosException {
NAMING_LOGGER.info("[UPDATE-SERVICE] {} updating service : {}", namespaceId, service);

final Map<String, String> params = new HashMap<String, String>(16);
final Map<String, String> params = new HashMap<String, String>(6);
params.put(CommonParams.NAMESPACE_ID, namespaceId);
params.put(CommonParams.SERVICE_NAME, service.getName());
params.put(CommonParams.GROUP_NAME, service.getGroupName());
Expand All @@ -295,7 +295,7 @@ public JsonNode sendBeat(BeatInfo beatInfo, boolean lightBeatEnabled) throws Nac
if (NAMING_LOGGER.isDebugEnabled()) {
NAMING_LOGGER.debug("[BEAT] {} sending beat to server: {}", namespaceId, beatInfo.toString());
}
Map<String, String> params = new HashMap<String, String>(16);
Map<String, String> params = new HashMap<String, String>(8);
Map<String, String> bodyMap = new HashMap<String, String>(2);
if (!lightBeatEnabled) {
bodyMap.put("beat", JacksonUtils.toJson(beatInfo));
Expand All @@ -313,7 +313,7 @@ public JsonNode sendBeat(BeatInfo beatInfo, boolean lightBeatEnabled) throws Nac
public boolean serverHealthy() {

try {
String result = reqApi(UtilAndComs.nacosUrlBase + "/operator/metrics", new HashMap<String, String>(8),
String result = reqApi(UtilAndComs.nacosUrlBase + "/operator/metrics", new HashMap<String, String>(2),
HttpMethod.GET);
JsonNode json = JacksonUtils.toObj(result);
String serverStatus = json.get("status").asText();
Expand All @@ -327,7 +327,7 @@ public boolean serverHealthy() {
public ListView<String> getServiceList(int pageNo, int pageSize, String groupName, AbstractSelector selector)
throws NacosException {

Map<String, String> params = new HashMap<String, String>(16);
Map<String, String> params = new HashMap<String, String>(4);
params.put("pageNo", String.valueOf(pageNo));
params.put("pageSize", String.valueOf(pageSize));
params.put(CommonParams.NAMESPACE_ID, namespaceId);
Expand Down
1 change: 0 additions & 1 deletion config/src/main/java/com/alibaba/nacos/config/server/constant/PropertiesConstant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,5 @@ public class PropertiesConstant {

public static final String MYSQL = "mysql";

public static final String EMBEDDED_STORAGE = "embeddedStorage";

}
6 changes: 2 additions & 4 deletions config/src/main/java/com/alibaba/nacos/config/server/utils/PropertyUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ public static boolean isDirectRead() {
}

public static void setEmbeddedStorage(boolean embeddedStorage) {
PropertyUtil.embeddedStorage = embeddedStorage;
PropertyUtil.embeddedStorage = embeddedStorage|| Boolean.getBoolean(PropertiesConstant.EMBEDDED_STORAGE);
}

private void loadSetting() {
Expand Down Expand Up @@ -291,9 +291,7 @@ private void loadSetting() {
if (isUseExternalDB()) {
setEmbeddedStorage(false);
} else {
boolean embeddedStorage =
PropertyUtil.embeddedStorage || Boolean.getBoolean(PropertiesConstant.EMBEDDED_STORAGE);
setEmbeddedStorage(embeddedStorage);
setEmbeddedStorage(PropertyUtil.embeddedStorage;);

// If the embedded data source storage is not turned on, it is automatically
// upgraded to the external data source storage, as before
Expand Down