From 2f674636c5985f76b58346157dcd33e046d1671c Mon Sep 17 00:00:00 2001 From: MindFocus Date: Tue, 25 Jun 2024 11:08:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/alipay/sofa/jraft/conf/Configuration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jraft-core/src/main/java/com/alipay/sofa/jraft/conf/Configuration.java b/jraft-core/src/main/java/com/alipay/sofa/jraft/conf/Configuration.java index 71759806b..c55c822a3 100644 --- a/jraft-core/src/main/java/com/alipay/sofa/jraft/conf/Configuration.java +++ b/jraft-core/src/main/java/com/alipay/sofa/jraft/conf/Configuration.java @@ -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))) { if (isLearner) { addLearner(peer); } else { From 6e982d9851685ca91dcd9d1c6f8f64215f920647 Mon Sep 17 00:00:00 2001 From: MindFocus Date: Tue, 25 Jun 2024 11:15:55 +0800 Subject: [PATCH 2/3] Update ConfigurationTest.java --- .../sofa/jraft/conf/ConfigurationTest.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/jraft-core/src/test/java/com/alipay/sofa/jraft/conf/ConfigurationTest.java b/jraft-core/src/test/java/com/alipay/sofa/jraft/conf/ConfigurationTest.java index 0fca94f2b..7e1cba415 100644 --- a/jraft-core/src/test/java/com/alipay/sofa/jraft/conf/ConfigurationTest.java +++ b/jraft-core/src/test/java/com/alipay/sofa/jraft/conf/ConfigurationTest.java @@ -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"; From 7ceaca9aa1150f7fe27d57cf4f9d9d34a7e78f2d Mon Sep 17 00:00:00 2001 From: fangtiecheng Date: Tue, 25 Jun 2024 14:17:18 +0800 Subject: [PATCH 3/3] tests: fix test, remove unused equals --- .../java/com/alipay/sofa/jraft/conf/ConfigurationTest.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/jraft-core/src/test/java/com/alipay/sofa/jraft/conf/ConfigurationTest.java b/jraft-core/src/test/java/com/alipay/sofa/jraft/conf/ConfigurationTest.java index 7e1cba415..61c20af4d 100644 --- a/jraft-core/src/test/java/com/alipay/sofa/jraft/conf/ConfigurationTest.java +++ b/jraft-core/src/test/java/com/alipay/sofa/jraft/conf/ConfigurationTest.java @@ -50,16 +50,12 @@ public void testToStringParseWithSpace() { 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