Skip to content

[fix][common] Preserve equals in FieldParser map values #25907

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
hiSandog wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[fix][common] Preserve equals in FieldParser map values #25907

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
2 changes: 1 addition & 1 deletion pulsar-common/src/main/java/org/apache/pulsar/common/util/FieldParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ private static <K, V> Map<K, V> stringToMap(String strValue, Class<K> keyType, C
String[] tokens = trim(strValue).split(",");
Map<K, V> map = new HashMap<>();
for (String token : tokens) {
String[] keyValue = trim(token).split("=");
String[] keyValue = trim(token).split("=", 2);
checkArgument(keyValue.length == 2,
strValue + " map-value is not in correct format key1=value,key2=value2");
map.put(convert(trim(keyValue[0]), keyType), convert(trim(keyValue[1]), valueType));
Expand Down
12 changes: 12 additions & 0 deletions pulsar-common/src/test/java/org/apache/pulsar/common/util/FieldParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,18 @@ public static class MyConfig {
public Set<String> stringSet;
}

@Test
public void testMapWithEqualsSignAndEmptyValue() {
Map<String, String> properties = new HashMap<>();
properties.put("stringStringMap", "key1=value=1,key2=");

MyConfig config = new MyConfig();
FieldParser.update(properties, config);

assertEquals(config.stringStringMap.get("key1"), "value=1");
assertEquals(config.stringStringMap.get("key2"), "");
}

@Test
public void testNullStrValue() throws Exception {
class TestMap {
Expand Down