提交 fc54c2ad 编写于 作者: J Jaskey 提交者: von gosling

ROCKETMQ-223-Rename DEFAULT_TOPIC (#119)

上级 461e5166
...@@ -66,9 +66,9 @@ public class TopicConfigManager extends ConfigManager { ...@@ -66,9 +66,9 @@ public class TopicConfigManager extends ConfigManager {
this.topicConfigTable.put(topicConfig.getTopicName(), topicConfig); this.topicConfigTable.put(topicConfig.getTopicName(), topicConfig);
} }
{ {
// MixAll.DEFAULT_TOPIC // MixAll.AUTO_CREATE_TOPIC_KEY_TOPIC
if (this.brokerController.getBrokerConfig().isAutoCreateTopicEnable()) { if (this.brokerController.getBrokerConfig().isAutoCreateTopicEnable()) {
String topic = MixAll.DEFAULT_TOPIC; String topic = MixAll.AUTO_CREATE_TOPIC_KEY_TOPIC;
TopicConfig topicConfig = new TopicConfig(topic); TopicConfig topicConfig = new TopicConfig(topic);
this.systemTopicList.add(topic); this.systemTopicList.add(topic);
topicConfig.setReadQueueNums(this.brokerController.getBrokerConfig() topicConfig.setReadQueueNums(this.brokerController.getBrokerConfig()
...@@ -135,7 +135,7 @@ public class TopicConfigManager extends ConfigManager { ...@@ -135,7 +135,7 @@ public class TopicConfigManager extends ConfigManager {
} }
public boolean isTopicCanSendMessage(final String topic) { public boolean isTopicCanSendMessage(final String topic) {
return !topic.equals(MixAll.DEFAULT_TOPIC); return !topic.equals(MixAll.AUTO_CREATE_TOPIC_KEY_TOPIC);
} }
public TopicConfig selectTopicConfig(final String topic) { public TopicConfig selectTopicConfig(final String topic) {
...@@ -156,7 +156,7 @@ public class TopicConfigManager extends ConfigManager { ...@@ -156,7 +156,7 @@ public class TopicConfigManager extends ConfigManager {
TopicConfig defaultTopicConfig = this.topicConfigTable.get(defaultTopic); TopicConfig defaultTopicConfig = this.topicConfigTable.get(defaultTopic);
if (defaultTopicConfig != null) { if (defaultTopicConfig != null) {
if (defaultTopic.equals(MixAll.DEFAULT_TOPIC)) { if (defaultTopic.equals(MixAll.AUTO_CREATE_TOPIC_KEY_TOPIC)) {
if (!this.brokerController.getBrokerConfig().isAutoCreateTopicEnable()) { if (!this.brokerController.getBrokerConfig().isAutoCreateTopicEnable()) {
defaultTopicConfig.setPerm(PermName.PERM_READ | PermName.PERM_WRITE); defaultTopicConfig.setPerm(PermName.PERM_READ | PermName.PERM_WRITE);
} }
......
...@@ -181,7 +181,7 @@ public class SendMessageProcessorTest { ...@@ -181,7 +181,7 @@ public class SendMessageProcessorTest {
SendMessageRequestHeader requestHeader = new SendMessageRequestHeader(); SendMessageRequestHeader requestHeader = new SendMessageRequestHeader();
requestHeader.setProducerGroup(group); requestHeader.setProducerGroup(group);
requestHeader.setTopic(topic); requestHeader.setTopic(topic);
requestHeader.setDefaultTopic(MixAll.DEFAULT_TOPIC); requestHeader.setDefaultTopic(MixAll.AUTO_CREATE_TOPIC_KEY_TOPIC);
requestHeader.setDefaultTopicQueueNums(3); requestHeader.setDefaultTopicQueueNums(3);
requestHeader.setQueueId(1); requestHeader.setQueueId(1);
requestHeader.setSysFlag(0); requestHeader.setSysFlag(0);
......
...@@ -119,9 +119,9 @@ public class Validators { ...@@ -119,9 +119,9 @@ public class Validators {
} }
//whether the same with system reserved keyword //whether the same with system reserved keyword
if (topic.equals(MixAll.DEFAULT_TOPIC)) { if (topic.equals(MixAll.AUTO_CREATE_TOPIC_KEY_TOPIC)) {
throw new MQClientException( throw new MQClientException(
String.format("The topic[%s] is conflict with default topic.", topic), null); String.format("The topic[%s] is conflict with AUTO_CREATE_TOPIC_KEY_TOPIC.", topic), null);
} }
} }
} }
...@@ -1204,7 +1204,7 @@ public class MQClientAPIImpl { ...@@ -1204,7 +1204,7 @@ public class MQClientAPIImpl {
assert response != null; assert response != null;
switch (response.getCode()) { switch (response.getCode()) {
case ResponseCode.TOPIC_NOT_EXIST: { case ResponseCode.TOPIC_NOT_EXIST: {
if (allowTopicNotExist && !topic.equals(MixAll.DEFAULT_TOPIC)) { if (allowTopicNotExist && !topic.equals(MixAll.AUTO_CREATE_TOPIC_KEY_TOPIC)) {
log.warn("get Topic [{}] RouteInfoFromNameServer is not exist value", topic); log.warn("get Topic [{}] RouteInfoFromNameServer is not exist value", topic);
} }
......
...@@ -654,7 +654,7 @@ public class MQClientInstance { ...@@ -654,7 +654,7 @@ public class MQClientInstance {
log.warn("updateTopicRouteInfoFromNameServer, getTopicRouteInfoFromNameServer return null, Topic: {}", topic); log.warn("updateTopicRouteInfoFromNameServer, getTopicRouteInfoFromNameServer return null, Topic: {}", topic);
} }
} catch (Exception e) { } catch (Exception e) {
if (!topic.startsWith(MixAll.RETRY_GROUP_TOPIC_PREFIX) && !topic.equals(MixAll.DEFAULT_TOPIC)) { if (!topic.startsWith(MixAll.RETRY_GROUP_TOPIC_PREFIX) && !topic.equals(MixAll.AUTO_CREATE_TOPIC_KEY_TOPIC)) {
log.warn("updateTopicRouteInfoFromNameServer Exception", e); log.warn("updateTopicRouteInfoFromNameServer Exception", e);
} }
} finally { } finally {
......
...@@ -76,7 +76,7 @@ public class DefaultMQProducer extends ClientConfig implements MQProducer { ...@@ -76,7 +76,7 @@ public class DefaultMQProducer extends ClientConfig implements MQProducer {
/** /**
* Just for testing or demo program * Just for testing or demo program
*/ */
private String createTopicKey = MixAll.DEFAULT_TOPIC; private String createTopicKey = MixAll.AUTO_CREATE_TOPIC_KEY_TOPIC;
/** /**
* Number of queues to create per default topic. * Number of queues to create per default topic.
......
...@@ -49,12 +49,12 @@ public class ValidatorsTest { ...@@ -49,12 +49,12 @@ public class ValidatorsTest {
@Test @Test
public void testCheckTopic_UseDefaultTopic() { public void testCheckTopic_UseDefaultTopic() {
String defaultTopic = MixAll.DEFAULT_TOPIC; String defaultTopic = MixAll.AUTO_CREATE_TOPIC_KEY_TOPIC;
try { try {
Validators.checkTopic(defaultTopic); Validators.checkTopic(defaultTopic);
failBecauseExceptionWasNotThrown(MQClientException.class); failBecauseExceptionWasNotThrown(MQClientException.class);
} catch (MQClientException e) { } catch (MQClientException e) {
assertThat(e).hasMessageStartingWith(String.format("The topic[%s] is conflict with default topic.", defaultTopic)); assertThat(e).hasMessageStartingWith(String.format("The topic[%s] is conflict with AUTO_CREATE_TOPIC_KEY_TOPIC.", defaultTopic));
} }
} }
......
...@@ -57,7 +57,7 @@ public class MixAll { ...@@ -57,7 +57,7 @@ public class MixAll {
public static final String WS_DOMAIN_SUBGROUP = System.getProperty("rocketmq.namesrv.domain.subgroup", "nsaddr"); public static final String WS_DOMAIN_SUBGROUP = System.getProperty("rocketmq.namesrv.domain.subgroup", "nsaddr");
//http://jmenv.tbsite.net:8080/rocketmq/nsaddr //http://jmenv.tbsite.net:8080/rocketmq/nsaddr
//public static final String WS_ADDR = "http://" + WS_DOMAIN_NAME + ":8080/rocketmq/" + WS_DOMAIN_SUBGROUP; //public static final String WS_ADDR = "http://" + WS_DOMAIN_NAME + ":8080/rocketmq/" + WS_DOMAIN_SUBGROUP;
public static final String DEFAULT_TOPIC = "TBW102"; public static final String AUTO_CREATE_TOPIC_KEY_TOPIC = "AUTO_CREATE_TOPIC_KEY"; // Will be created at broker when isAutoCreateTopicEnable
public static final String BENCHMARK_TOPIC = "BenchmarkTest"; public static final String BENCHMARK_TOPIC = "BenchmarkTest";
public static final String DEFAULT_PRODUCER_GROUP = "DEFAULT_PRODUCER"; public static final String DEFAULT_PRODUCER_GROUP = "DEFAULT_PRODUCER";
public static final String DEFAULT_CONSUMER_GROUP = "DEFAULT_CONSUMER"; public static final String DEFAULT_CONSUMER_GROUP = "DEFAULT_CONSUMER";
......
...@@ -59,7 +59,7 @@ import org.apache.rocketmq.tools.admin.api.MessageTrack; ...@@ -59,7 +59,7 @@ import org.apache.rocketmq.tools.admin.api.MessageTrack;
public class DefaultMQAdminExt extends ClientConfig implements MQAdminExt { public class DefaultMQAdminExt extends ClientConfig implements MQAdminExt {
private final DefaultMQAdminExtImpl defaultMQAdminExtImpl; private final DefaultMQAdminExtImpl defaultMQAdminExtImpl;
private String adminExtGroup = "admin_ext_group"; private String adminExtGroup = "admin_ext_group";
private String createTopicKey = MixAll.DEFAULT_TOPIC; private String createTopicKey = MixAll.AUTO_CREATE_TOPIC_KEY_TOPIC;
private long timeoutMillis = 5000; private long timeoutMillis = 5000;
public DefaultMQAdminExt() { public DefaultMQAdminExt() {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册