Skip to content

Commit 657d65b

Browse files
committed
Rename interfaces to make it consistent
1 parent 8969566 commit 657d65b

10 files changed

+21
-14
lines changed

src/main/java/redis/clients/jedis/MultiKeyPipelineBase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import java.util.Set;
88

99
public abstract class MultiKeyPipelineBase extends PipelineBase implements
10-
MultiKeyBinaryRedisPipeline, MultiKeyCommandsPipeline, ClusterPipeline,
11-
BinaryScriptingCommandsPipeline, ScriptingCommandsPipeline {
10+
PipelineMultiKeyBinaryCommands, PipelineMultiKeyCommands, PipelineClusterCommands,
11+
PipelineBinaryScriptingCommands, PipelineScriptingCommands {
1212

1313
protected Client client = null;
1414

src/main/java/redis/clients/jedis/PipelineBase.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@
77
import java.util.Set;
88

99
import redis.clients.jedis.BinaryClient.LIST_POSITION;
10-
import redis.clients.jedis.commands.BinaryRedisPipeline;
11-
import redis.clients.jedis.commands.RedisPipeline;
1210
import redis.clients.jedis.params.geo.GeoRadiusParam;
11+
import redis.clients.jedis.commands.PipelineBinaryJedisCommands;
12+
import redis.clients.jedis.commands.PipelineJedisCommands;
1313
import redis.clients.jedis.params.set.SetParams;
1414
import redis.clients.jedis.params.sortedset.ZAddParams;
1515
import redis.clients.jedis.params.sortedset.ZIncrByParams;
1616

17-
public abstract class PipelineBase extends Queable implements BinaryRedisPipeline, RedisPipeline {
17+
public abstract class PipelineBase extends Queable implements PipelineBinaryJedisCommands,
18+
PipelineJedisCommands {
1819

1920
protected abstract Client getClient(String key);
2021

src/main/java/redis/clients/jedis/commands/BasicRedisPipeline.java renamed to src/main/java/redis/clients/jedis/commands/PipelineBasicCommands.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
/**
88
* Pipelined responses for all of the low level, non key related commands
99
*/
10-
public interface BasicRedisPipeline {
10+
public interface PipelineBasicCommands {
1111

1212
Response<String> bgrewriteaof();
1313

src/main/java/redis/clients/jedis/commands/BinaryRedisPipeline.java renamed to src/main/java/redis/clients/jedis/commands/PipelineBinaryJedisCommands.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import java.util.Map;
1111
import java.util.Set;
1212

13-
public interface BinaryRedisPipeline {
13+
public interface PipelineBinaryJedisCommands {
1414
Response<Long> append(byte[] key, byte[] value);
1515

1616
Response<List<byte[]>> blpop(byte[] arg);

src/main/java/redis/clients/jedis/commands/BinaryScriptingCommandsPipeline.java renamed to src/main/java/redis/clients/jedis/commands/PipelineBinaryScriptingCommands.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import java.util.List;
66

7-
public interface BinaryScriptingCommandsPipeline {
7+
public interface PipelineBinaryScriptingCommands {
88

99
Response<Object> eval(byte[] script, byte[] keyCount, byte[]... params);
1010

src/main/java/redis/clients/jedis/commands/ClusterPipeline.java renamed to src/main/java/redis/clients/jedis/commands/PipelineClusterCommands.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import java.util.List;
66

7-
public interface ClusterPipeline {
7+
public interface PipelineClusterCommands {
88
Response<String> clusterNodes();
99

1010
Response<String> clusterMeet(final String ip, final int port);

src/main/java/redis/clients/jedis/commands/RedisPipeline.java renamed to src/main/java/redis/clients/jedis/commands/PipelineJedisCommands.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
package redis.clients.jedis.commands;
22

3-
import redis.clients.jedis.*;
3+
import redis.clients.jedis.BinaryClient;
4+
import redis.clients.jedis.GeoCoordinate;
5+
import redis.clients.jedis.GeoRadiusResponse;
6+
import redis.clients.jedis.GeoUnit;
7+
import redis.clients.jedis.Response;
8+
import redis.clients.jedis.SortingParams;
9+
import redis.clients.jedis.Tuple;
410
import redis.clients.jedis.params.geo.GeoRadiusParam;
511
import redis.clients.jedis.params.sortedset.ZAddParams;
612
import redis.clients.jedis.params.sortedset.ZIncrByParams;
@@ -9,7 +15,7 @@
915
import java.util.Map;
1016
import java.util.Set;
1117

12-
public interface RedisPipeline {
18+
public interface PipelineJedisCommands {
1319
Response<Long> append(String key, String value);
1420

1521
Response<List<String>> blpop(String arg);

src/main/java/redis/clients/jedis/commands/MultiKeyBinaryRedisPipeline.java renamed to src/main/java/redis/clients/jedis/commands/PipelineMultiKeyBinaryCommands.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/**
1212
* Multikey related commands (these are split out because they are non-shardable)
1313
*/
14-
public interface MultiKeyBinaryRedisPipeline {
14+
public interface PipelineMultiKeyBinaryCommands {
1515

1616
Response<Long> del(byte[]... keys);
1717

src/main/java/redis/clients/jedis/commands/MultiKeyCommandsPipeline.java renamed to src/main/java/redis/clients/jedis/commands/PipelineMultiKeyCommands.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/**
1212
* Multikey related commands (these are split out because they are non-shardable)
1313
*/
14-
public interface MultiKeyCommandsPipeline {
14+
public interface PipelineMultiKeyCommands {
1515
Response<Long> del(String... keys);
1616

1717
Response<Long> exists(String... keys);

src/main/java/redis/clients/jedis/commands/ScriptingCommandsPipeline.java renamed to src/main/java/redis/clients/jedis/commands/PipelineScriptingCommands.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import java.util.List;
66

7-
public interface ScriptingCommandsPipeline {
7+
public interface PipelineScriptingCommands {
88
Response<Object> eval(String script, int keyCount, String... params);
99

1010
Response<Object> eval(String script, List<String> keys, List<String> args);

0 commit comments

Comments
 (0)