Skip to content

Commit

Permalink
Polish alibaba#111 : Replace config module
Browse files Browse the repository at this point in the history
  • Loading branch information
mercyblitz committed Oct 3, 2018
1 parent 356d994 commit e08dca3
Show file tree
Hide file tree
Showing 3 changed files with 110 additions and 40 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

/**
* Server Constants
* @author Nacos
*
* @author Nacos
*/
public class Constants {

Expand All @@ -27,21 +27,21 @@ public class Constants {
public static final String CLIENT_VERSION = "3.0.0";

public static int DATA_IN_BODY_VERSION = 204;

public static final String DEFAULT_GROUP = "DEFAULT_GROUP";

/**
* server端配置文件基目录
* server端配置文件基目录
*/
public static final String BASE_DIR = "config-data";

/**
* server端配置文件备份目录
*/
public static final String CONFIG_BAK_DIR = System.getProperty("user.home", "/home/admin") + "/nacos/bak_data";

public static final String APPNAME = "AppName";

public static final String UNKNOWN_APP = "UnknownApp";

public static final String DEFAULT_DOMAINNAME = "commonconfig.config-host.taobao.com";
Expand Down Expand Up @@ -79,7 +79,7 @@ public class Constants {
/**
* 秒
*/
public static final int ASYNC_UPDATE_ADDRESS_INTERVAL = 300;
public static final int ASYNC_UPDATE_ADDRESS_INTERVAL = 300;
/**
* 秒
*/
Expand All @@ -101,24 +101,40 @@ public class Constants {
*/
public static final int RECV_WAIT_TIMEOUT = ONCE_TIMEOUT * 5;

public static final String BASE_PATH = "/v1/cs";

public static final String OPS_CONTROLLER_PATH = BASE_PATH + "/ops";
public static final String BASE_PATH = "/nacos/v1/cs";

public static final String DEFAULT_OPS_CONTROLLER_PATH = BASE_PATH + "/ops";

public static final String OPS_CONTROLLER_PATH = "${nacos.config.ops.path" + ":" + DEFAULT_OPS_CONTROLLER_PATH + "}";

public static final String DEFAULT_CAPACITY_CONTROLLER_PATH = BASE_PATH + "/capacity";

public static final String CAPACITY_CONTROLLER_PATH = "${nacos.config.capacity.path" + ":" + DEFAULT_CAPACITY_CONTROLLER_PATH + "}";

public static final String DEFAULT_COMMUNICATION_CONTROLLER_PATH = BASE_PATH + "/communication";

public static final String COMMUNICATION_CONTROLLER_PATH = "${nacos.config.communication.path" + ":" + DEFAULT_COMMUNICATION_CONTROLLER_PATH + "}";

public static final String CAPACITY_CONTROLLER_PATH = BASE_PATH + "/capacity";

public static final String COMMUNICATION_CONTROLLER_PATH = BASE_PATH + "/communication";

public static final String CONFIG_CONTROLLER_PATH = BASE_PATH + "/configs";

public static final String HEALTH_CONTROLLER_PATH = BASE_PATH + "/health";
public static final String DEFAULT_CONFIG_CONTROLLER_PATH = BASE_PATH + "/configs";

public static final String HISTORY_CONTROLLER_PATH = BASE_PATH + "/history";
public static final String CONFIG_CONTROLLER_PATH = "${nacos.config.path" + ":" + DEFAULT_CONFIG_CONTROLLER_PATH + "}";

public static final String DEFAULT_HEALTH_CONTROLLER_PATH = BASE_PATH + "/health";

public static final String HEALTH_CONTROLLER_PATH = "${nacos.config.health.path" + ":" + DEFAULT_HEALTH_CONTROLLER_PATH + "}";

public static final String DEFAULT_HISTORY_CONTROLLER_PATH = BASE_PATH + "/history";

public static final String HISTORY_CONTROLLER_PATH = "${nacos.config.history.path" + ":" + DEFAULT_HISTORY_CONTROLLER_PATH + "}";

public static final String DEFAULT_LISTENER_CONTROLLER_PATH = BASE_PATH + "/listener";

public static final String LISTENER_CONTROLLER_PATH = "${nacos.config.listener.path" + ":" + DEFAULT_LISTENER_CONTROLLER_PATH + "}";

public static final String DEFAULT_NAMESPACE_CONTROLLER_PATH = BASE_PATH + "/namespaces";

public static final String NAMESPACE_CONTROLLER_PATH = "${nacos.config.namespaces.path" + ":" + DEFAULT_NAMESPACE_CONTROLLER_PATH + "}";

public static final String LISTENER_CONTROLLER_PATH = BASE_PATH + "/listener";

public static final String NAMESPACE_CONTROLLER_PATH = BASE_PATH + "/namespaces";

public static final String ENCODE = "UTF-8";

public static final String MAP_FILE = "map-file.js";
Expand All @@ -136,39 +152,39 @@ public class Constants {
public static final String NACOS_LINE_SEPARATOR = "\r\n";

/**
* 从网络获取数据的总时间, 当超过此时间, 不再从网络获取数据, 单位ms
* 从网络获取数据的总时间, 当超过此时间, 不再从网络获取数据, 单位ms
*/
public static final long TOTALTIME_FROM_SERVER = 10000;
/**
* 从网络获取数据的总时间的失效时间, 单位ms
* 从网络获取数据的总时间的失效时间, 单位ms
*/
public static final long TOTALTIME_INVALID_THRESHOLD = 60000;

/**
* 批量操作时, 单条数据的状态码
*/
/**
* 发生异常
* 发生异常
*/
public static final int BATCH_OP_ERROR = -1;
public static final String BATCH_OP_ERROR_IO_MSG = "get config dump error";
public static final String BATCH_OP_ERROR_CONFLICT_MSG = "config get conflicts";
/**
* 查询成功, 数据存在
* 查询成功, 数据存在
*/
public static final int BATCH_QUERY_EXISTS = 1;
public static final String BATCH_QUERY_EXISTS_MSG = "config exits";
/**
* 查询成功, 数据不存在
* 查询成功, 数据不存在
*/
public static final int BATCH_QUERY_NONEXISTS = 2;
public static final String BATCH_QUERY_NONEEXISTS_MSG = "config not exits";
/**
* 新增成功
* 新增成功
*/
public static final int BATCH_ADD_SUCCESS = 3;
/**
* 更新成功
* 更新成功
*/
public static final int BATCH_UPDATE_SUCCESS = 4;

Expand All @@ -180,20 +196,20 @@ public class Constants {
public static final int MAX_ADDACK_COUNT = 5;

/**
* 数据的初始版本号
* 数据的初始版本号
*/
public static final int FIRST_VERSION = 1;
/**
* 数据被删除的标识版本号
* 数据被删除的标识版本号
*/
public static final int POISON_VERSION = -1;
/**
* 写磁盘文件时, 临时版本号
* 写磁盘文件时, 临时版本号
*/
public static final int TEMP_VERSION = 0;
/**
* 获取数据的顺序:容灾文件-> 服务器 -> 本地缓存
*/
/**
* 获取数据的顺序:容灾文件-> 服务器 -> 本地缓存
*/
public static final int GETCONFIG_LOCAL_SERVER_SNAPSHOT = 1;
/**
* 获取数据的顺序:容灾文件-> 本地缓存 -> 服务器
Expand All @@ -204,13 +220,13 @@ public class Constants {
public static final String CLIENT_REQUEST_TS_HEADER = "Client-RequestTS";
public static final String CLIENT_REQUEST_TOKEN_HEADER = "Client-RequestToken";
/**
* client, sdk请求server服务的身份
* client, sdk请求server服务的身份
*/
public static final String REQUEST_IDENTITY = "Request-Identity";
public static final String REQUEST_IDENTITY = "Request-Identity";
/**
* 鉴权结果信息
* 鉴权结果信息
*/
public static final String ACL_RESPONSE = "ACL-Response";
public static final String ACL_RESPONSE = "ACL-Response";

public static final int ATOMIC_MAX_SIZE = 1000;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You 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.
*/
package com.alibaba.nacos.config.server.constant;

import org.junit.Assert;
import org.junit.Test;
import org.springframework.mock.env.MockEnvironment;

import static com.alibaba.nacos.config.server.constant.Constants.*;

/**
* {@link Constants} Test
*
* @author <a href="mailto:[email protected]">Mercy</a>
* @since 0.2.2
*/
public class ConstantsTest {

@Test
public void testControllerPathsDefaultValues() {

MockEnvironment environment = new MockEnvironment();

Assert.assertEquals(DEFAULT_CAPACITY_CONTROLLER_PATH, environment.resolvePlaceholders(CAPACITY_CONTROLLER_PATH));
Assert.assertEquals(DEFAULT_COMMUNICATION_CONTROLLER_PATH, environment.resolvePlaceholders(COMMUNICATION_CONTROLLER_PATH));
Assert.assertEquals(DEFAULT_CONFIG_CONTROLLER_PATH, environment.resolvePlaceholders(CONFIG_CONTROLLER_PATH));
Assert.assertEquals(DEFAULT_HEALTH_CONTROLLER_PATH, environment.resolvePlaceholders(HEALTH_CONTROLLER_PATH));
Assert.assertEquals(DEFAULT_HISTORY_CONTROLLER_PATH, environment.resolvePlaceholders(HISTORY_CONTROLLER_PATH));
Assert.assertEquals(DEFAULT_LISTENER_CONTROLLER_PATH, environment.resolvePlaceholders(LISTENER_CONTROLLER_PATH));
Assert.assertEquals(DEFAULT_NAMESPACE_CONTROLLER_PATH, environment.resolvePlaceholders(NAMESPACE_CONTROLLER_PATH));


Assert.assertEquals("/nacos/v1/cs/capacity", DEFAULT_CAPACITY_CONTROLLER_PATH);
Assert.assertEquals("/nacos/v1/cs/communication", DEFAULT_COMMUNICATION_CONTROLLER_PATH);
Assert.assertEquals("/nacos/v1/cs/configs", DEFAULT_CONFIG_CONTROLLER_PATH);
Assert.assertEquals("/nacos/v1/cs/health", DEFAULT_HEALTH_CONTROLLER_PATH);
Assert.assertEquals("/nacos/v1/cs/history", DEFAULT_HISTORY_CONTROLLER_PATH);
Assert.assertEquals("/nacos/v1/cs/listener", DEFAULT_LISTENER_CONTROLLER_PATH);
Assert.assertEquals("/nacos/v1/cs/namespaces", DEFAULT_NAMESPACE_CONTROLLER_PATH);
}
}
1 change: 0 additions & 1 deletion core/src/main/resources/META-INF/nacos-default.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Nacos Default Properties

## Web Server
server.servlet.context-path=/nacos
server.port=8848
server.tomcat.uri-encoding=UTF-8

Expand Down

0 comments on commit e08dca3

Please sign in to comment.