Skip to content

Commit 33a185a

Browse files
authored
[ISSUE #9221] Extract some common code in BrokerPathConfigHelper (#9222)
1 parent 40b25b3 commit 33a185a

File tree

2 files changed

+37
-13
lines changed

2 files changed

+37
-13
lines changed

broker/src/main/java/org/apache/rocketmq/broker/BrokerPathConfigHelper.java

+15-11
Original file line numberDiff line numberDiff line change
@@ -32,43 +32,47 @@ public static void setBrokerConfigPath(String path) {
3232
}
3333

3434
public static String getTopicConfigPath(final String rootDir) {
35-
return rootDir + File.separator + "config" + File.separator + "topics.json";
35+
return getConfigDir(rootDir) + "topics.json";
3636
}
3737

3838
public static String getTopicQueueMappingPath(final String rootDir) {
39-
return rootDir + File.separator + "config" + File.separator + "topicQueueMapping.json";
39+
return getConfigDir(rootDir) + "topicQueueMapping.json";
4040
}
4141

4242
public static String getConsumerOffsetPath(final String rootDir) {
43-
return rootDir + File.separator + "config" + File.separator + "consumerOffset.json";
43+
return getConfigDir(rootDir) + "consumerOffset.json";
4444
}
4545

4646
public static String getLmqConsumerOffsetPath(final String rootDir) {
47-
return rootDir + File.separator + "config" + File.separator + "lmqConsumerOffset.json";
47+
return getConfigDir(rootDir) + "lmqConsumerOffset.json";
4848
}
4949

5050
public static String getConsumerOrderInfoPath(final String rootDir) {
51-
return rootDir + File.separator + "config" + File.separator + "consumerOrderInfo.json";
51+
return getConfigDir(rootDir) + "consumerOrderInfo.json";
5252
}
5353

5454
public static String getSubscriptionGroupPath(final String rootDir) {
55-
return rootDir + File.separator + "config" + File.separator + "subscriptionGroup.json";
55+
return getConfigDir(rootDir) + "subscriptionGroup.json";
5656
}
5757
public static String getTimerCheckPath(final String rootDir) {
58-
return rootDir + File.separator + "config" + File.separator + "timercheck";
58+
return getConfigDir(rootDir) + "timercheck";
5959
}
6060
public static String getTimerMetricsPath(final String rootDir) {
61-
return rootDir + File.separator + "config" + File.separator + "timermetrics";
61+
return getConfigDir(rootDir) + "timermetrics";
6262
}
6363
public static String getTransactionMetricsPath(final String rootDir) {
64-
return rootDir + File.separator + "config" + File.separator + "transactionMetrics";
64+
return getConfigDir(rootDir) + "transactionMetrics";
6565
}
6666

6767
public static String getConsumerFilterPath(final String rootDir) {
68-
return rootDir + File.separator + "config" + File.separator + "consumerFilter.json";
68+
return getConfigDir(rootDir) + "consumerFilter.json";
6969
}
7070

7171
public static String getMessageRequestModePath(final String rootDir) {
72-
return rootDir + File.separator + "config" + File.separator + "messageRequestMode.json";
72+
return getConfigDir(rootDir) + "messageRequestMode.json";
73+
}
74+
75+
private static String getConfigDir(final String rootDir) {
76+
return rootDir + File.separator + "config" + File.separator;
7377
}
7478
}

broker/src/test/java/org/apache/rocketmq/broker/BrokerPathConfigHelperTest.java

+22-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
public class BrokerPathConfigHelperTest {
2626

2727
@Test
28-
public void testGetLmqConsumerOffsetPath() {
28+
public void testGetPath() {
2929
String lmqConsumerOffsetPath = BrokerPathConfigHelper.getLmqConsumerOffsetPath("/home/admin/store".replace("/", File.separator));
3030
assertEquals("/home/admin/store/config/lmqConsumerOffset.json".replace("/", File.separator), lmqConsumerOffsetPath);
3131

@@ -38,5 +38,25 @@ public void testGetLmqConsumerOffsetPath() {
3838
String subscriptionGroupPath = BrokerPathConfigHelper.getSubscriptionGroupPath("/home/admin/store".replace("/", File.separator));
3939
assertEquals("/home/admin/store/config/subscriptionGroup.json".replace("/", File.separator), subscriptionGroupPath);
4040

41+
String topicQueueMappingPath = BrokerPathConfigHelper.getTopicQueueMappingPath("/home/admin/store".replace("/", File.separator));
42+
assertEquals("/home/admin/store/config/topicQueueMapping.json".replace("/", File.separator), topicQueueMappingPath);
43+
44+
String consumerOrderInfoPath = BrokerPathConfigHelper.getConsumerOrderInfoPath("/home/admin/store".replace("/", File.separator));
45+
assertEquals("/home/admin/store/config/consumerOrderInfo.json".replace("/", File.separator), consumerOrderInfoPath);
46+
47+
String timercheckPath = BrokerPathConfigHelper.getTimerCheckPath("/home/admin/store".replace("/", File.separator));
48+
assertEquals("/home/admin/store/config/timercheck".replace("/", File.separator), timercheckPath);
49+
50+
String timermetricsPath = BrokerPathConfigHelper.getTimerMetricsPath("/home/admin/store".replace("/", File.separator));
51+
assertEquals("/home/admin/store/config/timermetrics".replace("/", File.separator), timermetricsPath);
52+
53+
String transactionMetricsPath = BrokerPathConfigHelper.getTransactionMetricsPath("/home/admin/store".replace("/", File.separator));
54+
assertEquals("/home/admin/store/config/transactionMetrics".replace("/", File.separator), transactionMetricsPath);
55+
56+
String consumerFilterPath = BrokerPathConfigHelper.getConsumerFilterPath("/home/admin/store".replace("/", File.separator));
57+
assertEquals("/home/admin/store/config/consumerFilter.json".replace("/", File.separator), consumerFilterPath);
58+
59+
String messageRequestModePath = BrokerPathConfigHelper.getMessageRequestModePath("/home/admin/store".replace("/", File.separator));
60+
assertEquals("/home/admin/store/config/messageRequestMode.json".replace("/", File.separator), messageRequestModePath);
4161
}
42-
}
62+
}

0 commit comments

Comments
 (0)