Skip to content
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

Jump to bottom

fix: trim peer str #1115

Merged
merged 4 commits into from
Jun 25, 2024
Merged

fix: trim peer str #1115

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f67463
去除空格
mindfocus Jun 25, 2024
6e982d9
Update ConfigurationTest.java
mindfocus Jun 25, 2024
4ca53f5
Merge pull request #1 from mindfocus/mindfocus-patch-1
mindfocus Jun 25, 2024
7ceaca9
tests: fix test, remove unused equals
Jun 25, 2024
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 jraft-core/src/main/java/com/alipay/sofa/jraft/conf/Configuration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ public boolean parse(final String conf) {
peerStr = peerStr.substring(0, index);
isLearner = true;
}
if (peer.parse(peerStr)) {
if (peer.parse(StringUtils.trim(peerStr))) {
mindfocus marked this conversation as resolved.
Show resolved Hide resolved
if (isLearner) {
addLearner(peer);
} else {
Expand Down
21 changes: 21 additions & 0 deletions jraft-core/src/test/java/com/alipay/sofa/jraft/conf/ConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,27 @@ public void testToStringParseEmpty() {
assertEquals(conf, newConf);
}

@Test
public void testToStringParseWithSpace() {
final String confStr = "localhost:8081, localhost:8082, localhost:8083";
final Configuration conf = JRaftUtils.getConfiguration(confStr);
assertEquals(3, conf.size());
for (final PeerId peer : conf) {
assertTrue(peer.toString().startsWith("localhost:80"));
}
assertFalse(conf.isEmpty());
assertEquals(confStr, conf.toString());
final Configuration newConf = new Configuration();
assertTrue(newConf.parse(conf.toString()));
assertEquals(3, newConf.getPeerSet().size());
assertTrue(newConf.contains(new PeerId("localhost", 8081)));
assertTrue(newConf.contains(new PeerId("localhost", 8082)));
assertTrue(newConf.contains(new PeerId("localhost", 8083)));
assertEquals(confStr, newConf.toString());
assertEquals(conf.hashCode(), newConf.hashCode());
assertEquals(conf, newConf);
}

@Test
public void testToStringParseStuff() {
final String confStr = "localhost:8081,localhost:8082,localhost:8083";
Expand Down
Loading