From 9c9dc7e48029ee671f18fb8cd7a9f5def034d504 Mon Sep 17 00:00:00 2001 From: Tugdual Grall Date: Mon, 24 Aug 2020 07:04:41 +0200 Subject: [PATCH 1/3] Add toString method to the Params class --- src/main/java/redis/clients/jedis/params/Params.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/redis/clients/jedis/params/Params.java b/src/main/java/redis/clients/jedis/params/Params.java index fb8f7b1bf2..8953e83560 100644 --- a/src/main/java/redis/clients/jedis/params/Params.java +++ b/src/main/java/redis/clients/jedis/params/Params.java @@ -67,4 +67,10 @@ protected void addParam(String name) { params.put(name, null); } + @Override public String toString() { + if (params == null) { + params = new HashMap<>(); + } + return params.toString(); + } } From fd0831868af5e52d35a46b14e24c519a71e6b1bd Mon Sep 17 00:00:00 2001 From: Tugdual Grall Date: Thu, 27 Aug 2020 08:25:47 +0200 Subject: [PATCH 2/3] issue #2230 params.toString() after review --- .../redis/clients/jedis/params/Params.java | 17 +++++++++-- .../jedis/tests/params/ParamsTest.java | 30 +++++++++++++++++++ 2 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 src/test/java/redis/clients/jedis/tests/params/ParamsTest.java diff --git a/src/main/java/redis/clients/jedis/params/Params.java b/src/main/java/redis/clients/jedis/params/Params.java index 8953e83560..b4121fd809 100644 --- a/src/main/java/redis/clients/jedis/params/Params.java +++ b/src/main/java/redis/clients/jedis/params/Params.java @@ -68,9 +68,20 @@ protected void addParam(String name) { } @Override public String toString() { - if (params == null) { - params = new HashMap<>(); + ArrayList paramsAsString = new ArrayList<>(); + if (params != null) { + for (Entry param : params.entrySet()) { + paramsAsString.add(param.getKey()); + Object value = param.getValue(); + if (value != null) { + if (value instanceof byte[]) { + paramsAsString.add( SafeEncoder.encode((byte[]) value)); + } else { + paramsAsString.add(value.toString()); + } + } + } } - return params.toString(); + return paramsAsString.toString(); } } diff --git a/src/test/java/redis/clients/jedis/tests/params/ParamsTest.java b/src/test/java/redis/clients/jedis/tests/params/ParamsTest.java new file mode 100644 index 0000000000..8a9ba4aba3 --- /dev/null +++ b/src/test/java/redis/clients/jedis/tests/params/ParamsTest.java @@ -0,0 +1,30 @@ +package redis.clients.jedis.tests.params; + +import org.hamcrest.CoreMatchers; +import org.junit.Assert; +import org.junit.Test; +import redis.clients.jedis.params.ClientKillParams; +import redis.clients.jedis.params.GeoRadiusParam; +import redis.clients.jedis.params.ZAddParams; + +import static org.junit.Assert.assertEquals; + +public class ParamsTest { + + @Test + public void toStringTest() { + + ClientKillParams clientKillParams = ClientKillParams.clientKillParams() + .addr("127.0.0.1", 6379) + .id( "12".getBytes() ) + .type(ClientKillParams.Type.NORMAL) + ; + + String toStringResult = clientKillParams.toString(); + Assert.assertThat(toStringResult, CoreMatchers.containsString("ID, 12")); + Assert.assertThat(toStringResult, CoreMatchers.containsString("TYPE, NORMAL")); + Assert.assertThat(toStringResult, CoreMatchers.containsString("127.0.0.1:6379")); + + } + +} From 42eeca364d1fc2ed33f7972e647c1fb488691409 Mon Sep 17 00:00:00 2001 From: M Sazzadul Hoque <7600764+sazzad16@users.noreply.github.com> Date: Tue, 9 Mar 2021 21:21:33 +0600 Subject: [PATCH 3/3] reformat --- .../redis/clients/jedis/params/Params.java | 15 ++++----- .../jedis/tests/params/ParamsTest.java | 32 ++++++++----------- 2 files changed, 20 insertions(+), 27 deletions(-) diff --git a/src/main/java/redis/clients/jedis/params/Params.java b/src/main/java/redis/clients/jedis/params/Params.java index b4121fd809..1c17b2fe9e 100644 --- a/src/main/java/redis/clients/jedis/params/Params.java +++ b/src/main/java/redis/clients/jedis/params/Params.java @@ -67,21 +67,18 @@ protected void addParam(String name) { params.put(name, null); } - @Override public String toString() { - ArrayList paramsAsString = new ArrayList<>(); + @Override + public String toString() { + ArrayList paramsFlatList = new ArrayList<>(); if (params != null) { for (Entry param : params.entrySet()) { - paramsAsString.add(param.getKey()); + paramsFlatList.add(param.getKey()); Object value = param.getValue(); if (value != null) { - if (value instanceof byte[]) { - paramsAsString.add( SafeEncoder.encode((byte[]) value)); - } else { - paramsAsString.add(value.toString()); - } + paramsFlatList.add(SafeEncoder.encodeObject(value)); } } } - return paramsAsString.toString(); + return paramsFlatList.toString(); } } diff --git a/src/test/java/redis/clients/jedis/tests/params/ParamsTest.java b/src/test/java/redis/clients/jedis/tests/params/ParamsTest.java index 8a9ba4aba3..d57b11d2c1 100644 --- a/src/test/java/redis/clients/jedis/tests/params/ParamsTest.java +++ b/src/test/java/redis/clients/jedis/tests/params/ParamsTest.java @@ -1,30 +1,26 @@ package redis.clients.jedis.tests.params; +import static org.hamcrest.MatcherAssert.assertThat; + import org.hamcrest.CoreMatchers; -import org.junit.Assert; import org.junit.Test; -import redis.clients.jedis.params.ClientKillParams; -import redis.clients.jedis.params.GeoRadiusParam; -import redis.clients.jedis.params.ZAddParams; -import static org.junit.Assert.assertEquals; +import redis.clients.jedis.params.ClientKillParams; public class ParamsTest { - @Test - public void toStringTest() { - - ClientKillParams clientKillParams = ClientKillParams.clientKillParams() - .addr("127.0.0.1", 6379) - .id( "12".getBytes() ) - .type(ClientKillParams.Type.NORMAL) - ; + @Test + public void toStringTest() { - String toStringResult = clientKillParams.toString(); - Assert.assertThat(toStringResult, CoreMatchers.containsString("ID, 12")); - Assert.assertThat(toStringResult, CoreMatchers.containsString("TYPE, NORMAL")); - Assert.assertThat(toStringResult, CoreMatchers.containsString("127.0.0.1:6379")); + ClientKillParams clientKillParams = ClientKillParams.clientKillParams() + .addr("127.0.0.1", 6379) + .id("12".getBytes()) + .type(ClientKillParams.Type.NORMAL); - } + String toStringResult = clientKillParams.toString(); + assertThat(toStringResult, CoreMatchers.containsString("ID, 12")); + assertThat(toStringResult, CoreMatchers.containsString("TYPE, NORMAL")); + assertThat(toStringResult, CoreMatchers.containsString("127.0.0.1:6379")); + } }