Skip to content

fix: [Bug] NamespaceV2 is not working #10608

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

Open
123123213weqw wants to merge 1 commit into
base: develop
Choose a base branch
from
+36 −0
Open

fix: [Bug] NamespaceV2 is not working #10608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions client/src/main/java/org/apache/rocketmq/client/ClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,10 @@ public String getNamespace() {
return namespace;
}

if (StringUtils.isNotEmpty(namespaceV2)) {
return namespaceV2;
}

if (StringUtils.isNotEmpty(this.namesrvAddr)) {
if (NameServerAddressUtils.validateInstanceEndpoint(namesrvAddr)) {
namespace = NameServerAddressUtils.parseInstanceIdFromEndpoint(namesrvAddr);
Expand Down
32 changes: 32 additions & 0 deletions client/src/test/java/org/apache/rocketmq/client/ClientConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,38 @@ public void testQueuesWithNamespace() {
assertEquals("lmq%defaultTopic", messageQueues.iterator().next().getTopic());
}

@Test
public void testGetNamespaceFallbackToNamespaceV2() {
ClientConfig config = new ClientConfig();
config.setNamespaceV2("InstanceTest");
assertEquals("InstanceTest", config.getNamespace());
}

@Test
public void testWithNamespaceUsesNamespaceV2() {
ClientConfig config = new ClientConfig();
config.setNamespaceV2("InstanceTest");
assertEquals("InstanceTest%resource", config.withNamespace(resource));
assertEquals("InstanceTest%resource",
config.withNamespace("InstanceTest%resource"));
}

@Test
public void testWithoutNamespaceUsesNamespaceV2() {
ClientConfig config = new ClientConfig();
config.setNamespaceV2("InstanceTest");
assertEquals(resource, config.withoutNamespace("InstanceTest%resource"));
}

@Test
public void testNamespaceV1PrecedesNamespaceV2() {
ClientConfig config = new ClientConfig();
config.setNamespace("lmq");
config.setNamespaceV2("InstanceTest");
assertEquals("lmq", config.getNamespace());
assertEquals("lmq%resource", config.withNamespace(resource));
}

private ClientConfig createClientConfig() {
ClientConfig result = new ClientConfig();
result.setUnitName("unitName");
Expand Down