vongosling closed pull request #119: [ROCKETMQ-223]-Rename DEFAULT_TOPIC
URL: https://github.com/apache/rocketmq/pull/119
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java
b/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java
index cd30a089b..919649fe2 100644
---
a/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java
+++
b/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java
@@ -66,9 +66,9 @@ public TopicConfigManager(BrokerController brokerController) {
this.topicConfigTable.put(topicConfig.getTopicName(), topicConfig);
}
{
- // MixAll.DEFAULT_TOPIC
+ // MixAll.AUTO_CREATE_TOPIC_KEY_TOPIC
if
(this.brokerController.getBrokerConfig().isAutoCreateTopicEnable()) {
- String topic = MixAll.DEFAULT_TOPIC;
+ String topic = MixAll.AUTO_CREATE_TOPIC_KEY_TOPIC;
TopicConfig topicConfig = new TopicConfig(topic);
this.systemTopicList.add(topic);
topicConfig.setReadQueueNums(this.brokerController.getBrokerConfig()
@@ -135,7 +135,7 @@ public boolean isSystemTopic(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) {
@@ -156,7 +156,7 @@ public TopicConfig createTopicInSendMessageMethod(final
String topic, final Stri
TopicConfig defaultTopicConfig =
this.topicConfigTable.get(defaultTopic);
if (defaultTopicConfig != null) {
- if (defaultTopic.equals(MixAll.DEFAULT_TOPIC)) {
+ if
(defaultTopic.equals(MixAll.AUTO_CREATE_TOPIC_KEY_TOPIC)) {
if
(!this.brokerController.getBrokerConfig().isAutoCreateTopicEnable()) {
defaultTopicConfig.setPerm(PermName.PERM_READ
| PermName.PERM_WRITE);
}
diff --git
a/broker/src/test/java/org/apache/rocketmq/broker/processor/SendMessageProcessorTest.java
b/broker/src/test/java/org/apache/rocketmq/broker/processor/SendMessageProcessorTest.java
index 7828e7a91..b81ee5a2b 100644
---
a/broker/src/test/java/org/apache/rocketmq/broker/processor/SendMessageProcessorTest.java
+++
b/broker/src/test/java/org/apache/rocketmq/broker/processor/SendMessageProcessorTest.java
@@ -181,7 +181,7 @@ private RemotingCommand createSendMsgCommand(int
requestCode) {
SendMessageRequestHeader requestHeader = new
SendMessageRequestHeader();
requestHeader.setProducerGroup(group);
requestHeader.setTopic(topic);
- requestHeader.setDefaultTopic(MixAll.DEFAULT_TOPIC);
+ requestHeader.setDefaultTopic(MixAll.AUTO_CREATE_TOPIC_KEY_TOPIC);
requestHeader.setDefaultTopicQueueNums(3);
requestHeader.setQueueId(1);
requestHeader.setSysFlag(0);
diff --git a/client/src/main/java/org/apache/rocketmq/client/Validators.java
b/client/src/main/java/org/apache/rocketmq/client/Validators.java
index 5567e49b5..5d6acc0f8 100644
--- a/client/src/main/java/org/apache/rocketmq/client/Validators.java
+++ b/client/src/main/java/org/apache/rocketmq/client/Validators.java
@@ -119,9 +119,9 @@ public static void checkTopic(String topic) throws
MQClientException {
}
//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(
- 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);
}
}
}
diff --git
a/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java
b/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java
index c5abc36bf..593f05bd3 100644
--- a/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java
+++ b/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java
@@ -1208,7 +1208,7 @@ public TopicRouteData
getTopicRouteInfoFromNameServer(final String topic, final
assert response != null;
switch (response.getCode()) {
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);
}
diff --git
a/client/src/main/java/org/apache/rocketmq/client/impl/factory/MQClientInstance.java
b/client/src/main/java/org/apache/rocketmq/client/impl/factory/MQClientInstance.java
index 83b9ee767..ab5b01e7a 100644
---
a/client/src/main/java/org/apache/rocketmq/client/impl/factory/MQClientInstance.java
+++
b/client/src/main/java/org/apache/rocketmq/client/impl/factory/MQClientInstance.java
@@ -654,7 +654,7 @@ public boolean updateTopicRouteInfoFromNameServer(final
String topic, boolean is
log.warn("updateTopicRouteInfoFromNameServer,
getTopicRouteInfoFromNameServer return null, Topic: {}", topic);
}
} 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);
}
} finally {
diff --git
a/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java
b/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java
index a2f25dd0f..267dbe8f5 100644
---
a/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java
+++
b/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java
@@ -76,7 +76,7 @@
/**
* 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.
diff --git
a/client/src/test/java/org/apache/rocketmq/client/ValidatorsTest.java
b/client/src/test/java/org/apache/rocketmq/client/ValidatorsTest.java
index 2db648d86..5a012ceb0 100644
--- a/client/src/test/java/org/apache/rocketmq/client/ValidatorsTest.java
+++ b/client/src/test/java/org/apache/rocketmq/client/ValidatorsTest.java
@@ -49,12 +49,12 @@ public void testCheckTopic_HasIllegalCharacters() {
@Test
public void testCheckTopic_UseDefaultTopic() {
- String defaultTopic = MixAll.DEFAULT_TOPIC;
+ String defaultTopic = MixAll.AUTO_CREATE_TOPIC_KEY_TOPIC;
try {
Validators.checkTopic(defaultTopic);
failBecauseExceptionWasNotThrown(MQClientException.class);
} 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));
}
}
diff --git a/common/src/main/java/org/apache/rocketmq/common/MixAll.java
b/common/src/main/java/org/apache/rocketmq/common/MixAll.java
index 3a005e6a5..a8518fa35 100644
--- a/common/src/main/java/org/apache/rocketmq/common/MixAll.java
+++ b/common/src/main/java/org/apache/rocketmq/common/MixAll.java
@@ -57,7 +57,7 @@
public static final String WS_DOMAIN_SUBGROUP =
System.getProperty("rocketmq.namesrv.domain.subgroup", "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 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 DEFAULT_PRODUCER_GROUP = "DEFAULT_PRODUCER";
public static final String DEFAULT_CONSUMER_GROUP = "DEFAULT_CONSUMER";
diff --git
a/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExt.java
b/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExt.java
index eb45de22f..dc829c1c1 100644
--- a/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExt.java
+++ b/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExt.java
@@ -59,7 +59,7 @@
public class DefaultMQAdminExt extends ClientConfig implements MQAdminExt {
private final DefaultMQAdminExtImpl defaultMQAdminExtImpl;
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;
public DefaultMQAdminExt() {
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
