From b6684138e69aba10c55a2e2e6bbfca1fe0663cb3 Mon Sep 17 00:00:00 2001 From: M Sazzadul Hoque <7600764+sazzad16@users.noreply.github.com> Date: Tue, 20 Sep 2022 12:29:39 +0600 Subject: [PATCH] Separate package for RedisBloom commands (#3112) --- .../jedis/bloom/{ => commands}/BloomFilterCommands.java | 4 +++- .../bloom/{ => commands}/BloomFilterPipelineCommands.java | 4 +++- .../jedis/bloom/{ => commands}/CountMinSketchCommands.java | 2 +- .../bloom/{ => commands}/CountMinSketchPipelineCommands.java | 2 +- .../jedis/bloom/{ => commands}/CuckooFilterCommands.java | 4 +++- .../bloom/{ => commands}/CuckooFilterPipelineCommands.java | 4 +++- .../jedis/bloom/{ => commands}/RedisBloomCommands.java | 2 +- .../bloom/{ => commands}/RedisBloomPipelineCommands.java | 2 +- .../jedis/bloom/{ => commands}/TDigestSketchCommands.java | 3 ++- .../bloom/{ => commands}/TDigestSketchPipelineCommands.java | 3 ++- .../jedis/bloom/{ => commands}/TopKFilterCommands.java | 2 +- .../bloom/{ => commands}/TopKFilterPipelineCommands.java | 2 +- .../java/redis/clients/jedis/bloom/commands/package-info.java | 4 ++++ src/main/java/redis/clients/jedis/bloom/package-info.java | 2 +- .../redis/clients/jedis/commands/RedisModuleCommands.java | 2 +- .../clients/jedis/commands/RedisModulePipelineCommands.java | 2 +- .../java/redis/clients/jedis/modules/bloom/TDigestTest.java | 2 +- 17 files changed, 30 insertions(+), 16 deletions(-) rename src/main/java/redis/clients/jedis/bloom/{ => commands}/BloomFilterCommands.java (93%) rename src/main/java/redis/clients/jedis/bloom/{ => commands}/BloomFilterPipelineCommands.java (86%) rename src/main/java/redis/clients/jedis/bloom/{ => commands}/CountMinSketchCommands.java (98%) rename src/main/java/redis/clients/jedis/bloom/{ => commands}/CountMinSketchPipelineCommands.java (93%) rename src/main/java/redis/clients/jedis/bloom/{ => commands}/CuckooFilterCommands.java (97%) rename src/main/java/redis/clients/jedis/bloom/{ => commands}/CuckooFilterPipelineCommands.java (88%) rename src/main/java/redis/clients/jedis/bloom/{ => commands}/RedisBloomCommands.java (78%) rename src/main/java/redis/clients/jedis/bloom/{ => commands}/RedisBloomPipelineCommands.java (83%) rename src/main/java/redis/clients/jedis/bloom/{ => commands}/TDigestSketchCommands.java (97%) rename src/main/java/redis/clients/jedis/bloom/{ => commands}/TDigestSketchPipelineCommands.java (90%) rename src/main/java/redis/clients/jedis/bloom/{ => commands}/TopKFilterCommands.java (97%) rename src/main/java/redis/clients/jedis/bloom/{ => commands}/TopKFilterPipelineCommands.java (93%) create mode 100644 src/main/java/redis/clients/jedis/bloom/commands/package-info.java diff --git a/src/main/java/redis/clients/jedis/bloom/BloomFilterCommands.java b/src/main/java/redis/clients/jedis/bloom/commands/BloomFilterCommands.java similarity index 93% rename from src/main/java/redis/clients/jedis/bloom/BloomFilterCommands.java rename to src/main/java/redis/clients/jedis/bloom/commands/BloomFilterCommands.java index 664ba327c7..6e089aad90 100644 --- a/src/main/java/redis/clients/jedis/bloom/BloomFilterCommands.java +++ b/src/main/java/redis/clients/jedis/bloom/commands/BloomFilterCommands.java @@ -1,7 +1,9 @@ -package redis.clients.jedis.bloom; +package redis.clients.jedis.bloom.commands; import java.util.List; import java.util.Map; +import redis.clients.jedis.bloom.BFInsertParams; +import redis.clients.jedis.bloom.BFReserveParams; public interface BloomFilterCommands { diff --git a/src/main/java/redis/clients/jedis/bloom/BloomFilterPipelineCommands.java b/src/main/java/redis/clients/jedis/bloom/commands/BloomFilterPipelineCommands.java similarity index 86% rename from src/main/java/redis/clients/jedis/bloom/BloomFilterPipelineCommands.java rename to src/main/java/redis/clients/jedis/bloom/commands/BloomFilterPipelineCommands.java index 2944e115dd..3a36e861e0 100644 --- a/src/main/java/redis/clients/jedis/bloom/BloomFilterPipelineCommands.java +++ b/src/main/java/redis/clients/jedis/bloom/commands/BloomFilterPipelineCommands.java @@ -1,8 +1,10 @@ -package redis.clients.jedis.bloom; +package redis.clients.jedis.bloom.commands; import java.util.List; import java.util.Map; import redis.clients.jedis.Response; +import redis.clients.jedis.bloom.BFInsertParams; +import redis.clients.jedis.bloom.BFReserveParams; public interface BloomFilterPipelineCommands { diff --git a/src/main/java/redis/clients/jedis/bloom/CountMinSketchCommands.java b/src/main/java/redis/clients/jedis/bloom/commands/CountMinSketchCommands.java similarity index 98% rename from src/main/java/redis/clients/jedis/bloom/CountMinSketchCommands.java rename to src/main/java/redis/clients/jedis/bloom/commands/CountMinSketchCommands.java index 70d42031f3..ba41337850 100644 --- a/src/main/java/redis/clients/jedis/bloom/CountMinSketchCommands.java +++ b/src/main/java/redis/clients/jedis/bloom/commands/CountMinSketchCommands.java @@ -1,4 +1,4 @@ -package redis.clients.jedis.bloom; +package redis.clients.jedis.bloom.commands; import java.util.List; import java.util.Map; diff --git a/src/main/java/redis/clients/jedis/bloom/CountMinSketchPipelineCommands.java b/src/main/java/redis/clients/jedis/bloom/commands/CountMinSketchPipelineCommands.java similarity index 93% rename from src/main/java/redis/clients/jedis/bloom/CountMinSketchPipelineCommands.java rename to src/main/java/redis/clients/jedis/bloom/commands/CountMinSketchPipelineCommands.java index c6ca2c6c3d..f63d2c3e9d 100644 --- a/src/main/java/redis/clients/jedis/bloom/CountMinSketchPipelineCommands.java +++ b/src/main/java/redis/clients/jedis/bloom/commands/CountMinSketchPipelineCommands.java @@ -1,4 +1,4 @@ -package redis.clients.jedis.bloom; +package redis.clients.jedis.bloom.commands; import java.util.List; import java.util.Map; diff --git a/src/main/java/redis/clients/jedis/bloom/CuckooFilterCommands.java b/src/main/java/redis/clients/jedis/bloom/commands/CuckooFilterCommands.java similarity index 97% rename from src/main/java/redis/clients/jedis/bloom/CuckooFilterCommands.java rename to src/main/java/redis/clients/jedis/bloom/commands/CuckooFilterCommands.java index 5195c5dd7e..d62d707583 100644 --- a/src/main/java/redis/clients/jedis/bloom/CuckooFilterCommands.java +++ b/src/main/java/redis/clients/jedis/bloom/commands/CuckooFilterCommands.java @@ -1,7 +1,9 @@ -package redis.clients.jedis.bloom; +package redis.clients.jedis.bloom.commands; import java.util.List; import java.util.Map; +import redis.clients.jedis.bloom.CFInsertParams; +import redis.clients.jedis.bloom.CFReserveParams; /** * Interface for RedisBloom Cuckoo Filter Commands diff --git a/src/main/java/redis/clients/jedis/bloom/CuckooFilterPipelineCommands.java b/src/main/java/redis/clients/jedis/bloom/commands/CuckooFilterPipelineCommands.java similarity index 88% rename from src/main/java/redis/clients/jedis/bloom/CuckooFilterPipelineCommands.java rename to src/main/java/redis/clients/jedis/bloom/commands/CuckooFilterPipelineCommands.java index 93a7367262..b911d741ea 100644 --- a/src/main/java/redis/clients/jedis/bloom/CuckooFilterPipelineCommands.java +++ b/src/main/java/redis/clients/jedis/bloom/commands/CuckooFilterPipelineCommands.java @@ -1,8 +1,10 @@ -package redis.clients.jedis.bloom; +package redis.clients.jedis.bloom.commands; import java.util.List; import java.util.Map; import redis.clients.jedis.Response; +import redis.clients.jedis.bloom.CFInsertParams; +import redis.clients.jedis.bloom.CFReserveParams; public interface CuckooFilterPipelineCommands { diff --git a/src/main/java/redis/clients/jedis/bloom/RedisBloomCommands.java b/src/main/java/redis/clients/jedis/bloom/commands/RedisBloomCommands.java similarity index 78% rename from src/main/java/redis/clients/jedis/bloom/RedisBloomCommands.java rename to src/main/java/redis/clients/jedis/bloom/commands/RedisBloomCommands.java index 80978b44ac..e3577194a9 100644 --- a/src/main/java/redis/clients/jedis/bloom/RedisBloomCommands.java +++ b/src/main/java/redis/clients/jedis/bloom/commands/RedisBloomCommands.java @@ -1,4 +1,4 @@ -package redis.clients.jedis.bloom; +package redis.clients.jedis.bloom.commands; public interface RedisBloomCommands extends BloomFilterCommands, CuckooFilterCommands, CountMinSketchCommands, TopKFilterCommands, TDigestSketchCommands { diff --git a/src/main/java/redis/clients/jedis/bloom/RedisBloomPipelineCommands.java b/src/main/java/redis/clients/jedis/bloom/commands/RedisBloomPipelineCommands.java similarity index 83% rename from src/main/java/redis/clients/jedis/bloom/RedisBloomPipelineCommands.java rename to src/main/java/redis/clients/jedis/bloom/commands/RedisBloomPipelineCommands.java index 294605d1d5..91750a85b6 100644 --- a/src/main/java/redis/clients/jedis/bloom/RedisBloomPipelineCommands.java +++ b/src/main/java/redis/clients/jedis/bloom/commands/RedisBloomPipelineCommands.java @@ -1,4 +1,4 @@ -package redis.clients.jedis.bloom; +package redis.clients.jedis.bloom.commands; public interface RedisBloomPipelineCommands extends BloomFilterPipelineCommands, CuckooFilterPipelineCommands, CountMinSketchPipelineCommands, TopKFilterPipelineCommands, diff --git a/src/main/java/redis/clients/jedis/bloom/TDigestSketchCommands.java b/src/main/java/redis/clients/jedis/bloom/commands/TDigestSketchCommands.java similarity index 97% rename from src/main/java/redis/clients/jedis/bloom/TDigestSketchCommands.java rename to src/main/java/redis/clients/jedis/bloom/commands/TDigestSketchCommands.java index b76ce61d7f..cb2f84ce57 100644 --- a/src/main/java/redis/clients/jedis/bloom/TDigestSketchCommands.java +++ b/src/main/java/redis/clients/jedis/bloom/commands/TDigestSketchCommands.java @@ -1,7 +1,8 @@ -package redis.clients.jedis.bloom; +package redis.clients.jedis.bloom.commands; import java.util.List; import java.util.Map; +import redis.clients.jedis.bloom.TDigestMergeParams; public interface TDigestSketchCommands { diff --git a/src/main/java/redis/clients/jedis/bloom/TDigestSketchPipelineCommands.java b/src/main/java/redis/clients/jedis/bloom/commands/TDigestSketchPipelineCommands.java similarity index 90% rename from src/main/java/redis/clients/jedis/bloom/TDigestSketchPipelineCommands.java rename to src/main/java/redis/clients/jedis/bloom/commands/TDigestSketchPipelineCommands.java index b908c39635..5c582133ca 100644 --- a/src/main/java/redis/clients/jedis/bloom/TDigestSketchPipelineCommands.java +++ b/src/main/java/redis/clients/jedis/bloom/commands/TDigestSketchPipelineCommands.java @@ -1,8 +1,9 @@ -package redis.clients.jedis.bloom; +package redis.clients.jedis.bloom.commands; import java.util.List; import java.util.Map; import redis.clients.jedis.Response; +import redis.clients.jedis.bloom.TDigestMergeParams; public interface TDigestSketchPipelineCommands { diff --git a/src/main/java/redis/clients/jedis/bloom/TopKFilterCommands.java b/src/main/java/redis/clients/jedis/bloom/commands/TopKFilterCommands.java similarity index 97% rename from src/main/java/redis/clients/jedis/bloom/TopKFilterCommands.java rename to src/main/java/redis/clients/jedis/bloom/commands/TopKFilterCommands.java index 4c6ab15ab2..62db35752f 100644 --- a/src/main/java/redis/clients/jedis/bloom/TopKFilterCommands.java +++ b/src/main/java/redis/clients/jedis/bloom/commands/TopKFilterCommands.java @@ -1,4 +1,4 @@ -package redis.clients.jedis.bloom; +package redis.clients.jedis.bloom.commands; import java.util.List; import java.util.Map; diff --git a/src/main/java/redis/clients/jedis/bloom/TopKFilterPipelineCommands.java b/src/main/java/redis/clients/jedis/bloom/commands/TopKFilterPipelineCommands.java similarity index 93% rename from src/main/java/redis/clients/jedis/bloom/TopKFilterPipelineCommands.java rename to src/main/java/redis/clients/jedis/bloom/commands/TopKFilterPipelineCommands.java index f37130549f..5750473460 100644 --- a/src/main/java/redis/clients/jedis/bloom/TopKFilterPipelineCommands.java +++ b/src/main/java/redis/clients/jedis/bloom/commands/TopKFilterPipelineCommands.java @@ -1,4 +1,4 @@ -package redis.clients.jedis.bloom; +package redis.clients.jedis.bloom.commands; import java.util.List; import java.util.Map; diff --git a/src/main/java/redis/clients/jedis/bloom/commands/package-info.java b/src/main/java/redis/clients/jedis/bloom/commands/package-info.java new file mode 100644 index 0000000000..e13c1638e5 --- /dev/null +++ b/src/main/java/redis/clients/jedis/bloom/commands/package-info.java @@ -0,0 +1,4 @@ +/** + * This package contains the interfaces that contain methods representing RedisBloom commands. + */ +package redis.clients.jedis.bloom.commands; diff --git a/src/main/java/redis/clients/jedis/bloom/package-info.java b/src/main/java/redis/clients/jedis/bloom/package-info.java index 5c910ec9b5..e196f93497 100644 --- a/src/main/java/redis/clients/jedis/bloom/package-info.java +++ b/src/main/java/redis/clients/jedis/bloom/package-info.java @@ -1,4 +1,4 @@ /** - * This package contains the classes and interfaces related to RedisBloom module. + * This package contains the classes related to RedisBloom module. */ package redis.clients.jedis.bloom; diff --git a/src/main/java/redis/clients/jedis/commands/RedisModuleCommands.java b/src/main/java/redis/clients/jedis/commands/RedisModuleCommands.java index af17f2a448..47d01fa0bd 100644 --- a/src/main/java/redis/clients/jedis/commands/RedisModuleCommands.java +++ b/src/main/java/redis/clients/jedis/commands/RedisModuleCommands.java @@ -1,6 +1,6 @@ package redis.clients.jedis.commands; -import redis.clients.jedis.bloom.RedisBloomCommands; +import redis.clients.jedis.bloom.commands.RedisBloomCommands; import redis.clients.jedis.graph.RedisGraphCommands; import redis.clients.jedis.json.RedisJsonCommands; import redis.clients.jedis.search.RediSearchCommands; diff --git a/src/main/java/redis/clients/jedis/commands/RedisModulePipelineCommands.java b/src/main/java/redis/clients/jedis/commands/RedisModulePipelineCommands.java index 79f468d27e..fc768bb60f 100644 --- a/src/main/java/redis/clients/jedis/commands/RedisModulePipelineCommands.java +++ b/src/main/java/redis/clients/jedis/commands/RedisModulePipelineCommands.java @@ -1,6 +1,6 @@ package redis.clients.jedis.commands; -import redis.clients.jedis.bloom.RedisBloomPipelineCommands; +import redis.clients.jedis.bloom.commands.RedisBloomPipelineCommands; import redis.clients.jedis.graph.RedisGraphPipelineCommands; import redis.clients.jedis.json.RedisJsonPipelineCommands; import redis.clients.jedis.search.RediSearchPipelineCommands; diff --git a/src/test/java/redis/clients/jedis/modules/bloom/TDigestTest.java b/src/test/java/redis/clients/jedis/modules/bloom/TDigestTest.java index f69c84b227..cb0a3a3990 100644 --- a/src/test/java/redis/clients/jedis/modules/bloom/TDigestTest.java +++ b/src/test/java/redis/clients/jedis/modules/bloom/TDigestTest.java @@ -7,8 +7,8 @@ import java.util.Random; import org.junit.BeforeClass; import org.junit.Test; -import redis.clients.jedis.bloom.TDigestMergeParams; +import redis.clients.jedis.bloom.TDigestMergeParams; import redis.clients.jedis.modules.RedisModuleCommandsTestBase; import redis.clients.jedis.util.KeyValue;