Merge e28745a into 24653e0

gerzse · web-flow · commit 7090808027ff · 2024-03-15T08:16:44.000Z
diff --git a/src/main/java/redis/clients/jedis/PipeliningBase.java b/src/main/java/redis/clients/jedis/PipeliningBase.java
@@ -786,7 +786,7 @@ public Response<Set<String>> sdiff(String... keys) {
   }
 
   @Override
-  public Response<Long> sdiffStore(String dstKey, String... keys) {
+  public Response<Long> sdiffstore(String dstKey, String... keys) {
     return appendCommand(commandObjects.sdiffstore(dstKey, keys));
   }
 
diff --git a/src/main/java/redis/clients/jedis/commands/SetPipelineCommands.java b/src/main/java/redis/clients/jedis/commands/SetPipelineCommands.java
@@ -37,7 +37,14 @@ default Response<ScanResult<String>> sscan(String key, String cursor) {
 
   Response<Set<String>> sdiff(String... keys);
 
-  Response<Long> sdiffStore(String dstKey, String... keys);
+  Response<Long> sdiffstore(String dstKey, String... keys);
+
+  /**
+   * @deprecated Use {@code redis.clients.jedis.commands.SetPipelineCommands#sdiffstore(java.lang.String, java.lang.String...)}
+   */
+  default Response<Long> sdiffStore(String dstKey, String... keys) {
+    return sdiffstore(dstKey, keys);
+  }
 
   Response<Set<String>> sinter(String... keys);
 
diff --git a/src/test/java/redis/clients/jedis/ClusterPipeliningTest.java b/src/test/java/redis/clients/jedis/ClusterPipeliningTest.java
@@ -527,7 +527,8 @@ public void clusterPipelineSet() {
     Response<Long> r1 = p.sadd("my{set}", "hello", "hello", "world", "foo", "bar");
     p.sadd("mynew{set}", "hello", "hello", "world");
     Response<Set<String>> r2 = p.sdiff("my{set}", "mynew{set}");
-    Response<Long> r3 = p.sdiffStore("diffset{set}", "my{set}", "mynew{set}");
+    Response<Long> r3deprecated = p.sdiffStore("diffset{set}deprecated", "my{set}", "mynew{set}");
+    Response<Long> r3 = p.sdiffstore("diffset{set}", "my{set}", "mynew{set}");
     Response<Set<String>> r4 = p.smembers("diffset{set}");
     Response<Set<String>> r5 = p.sinter("my{set}", "mynew{set}");
     Response<Long> r6 = p.sinterstore("interset{set}", "my{set}", "mynew{set}");
@@ -547,6 +548,7 @@ public void clusterPipelineSet() {
     p.sync();
     assertEquals(Long.valueOf(4), r1.get());
     assertEquals(diff, r2.get());
+    assertEquals(Long.valueOf(diff.size()), r3deprecated.get());
     assertEquals(Long.valueOf(diff.size()), r3.get());
     assertEquals(diff, r4.get());
     assertEquals(inter, r5.get());

Original file line number	Diff line number	Diff line change
`@@ -786,7 +786,7 @@ public Response<Set<String>> sdiff(String... keys) {`
`786`	`786`	`}`
`787`	`787`
`788`	`788`	`@Override`
`789`		`- public Response<Long> sdiffStore(String dstKey, String... keys) {`
	`789`	`+ public Response<Long> sdiffstore(String dstKey, String... keys) {`
`790`	`790`	`return appendCommand(commandObjects.sdiffstore(dstKey, keys));`
`791`	`791`	`}`
`792`	`792`