Skip to content

Commit 4c87775

Browse files
authored
Deprecate SENTINEL SLAVES and change tests (#2673)
1 parent b2fab36 commit 4c87775

File tree

4 files changed

+23
-22
lines changed

4 files changed

+23
-22
lines changed

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

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3515,9 +3515,25 @@ public Long sentinelReset(final String pattern) {
35153515
return client.getIntegerReply();
35163516
}
35173517

3518+
/**
3519+
* @deprecated Use {@link Jedis#sentinelReplicas(java.lang.String)}.
3520+
*/
3521+
@Override
3522+
@Deprecated
3523+
public List<Map<String, String>> sentinelSlaves(final String masterName) {
3524+
client.sentinel(Protocol.SENTINEL_SLAVES, masterName);
3525+
final List<Object> reply = client.getObjectMultiBulkReply();
3526+
3527+
final List<Map<String, String>> slaves = new ArrayList<>();
3528+
for (Object obj : reply) {
3529+
slaves.add(BuilderFactory.STRING_MAP.build(obj));
3530+
}
3531+
return slaves;
3532+
}
3533+
35183534
/**
35193535
* <pre>
3520-
* redis 127.0.0.1:26381&gt; sentinel slaves mymaster
3536+
* redis 127.0.0.1:26381&gt; sentinel replicas mymaster
35213537
* 1) 1) "name"
35223538
* 2) "127.0.0.1:6380"
35233539
* 3) "ip"
@@ -3550,18 +3566,6 @@ public Long sentinelReset(final String pattern) {
35503566
* @param masterName
35513567
* @return
35523568
*/
3553-
@Override
3554-
public List<Map<String, String>> sentinelSlaves(final String masterName) {
3555-
client.sentinel(Protocol.SENTINEL_SLAVES, masterName);
3556-
final List<Object> reply = client.getObjectMultiBulkReply();
3557-
3558-
final List<Map<String, String>> slaves = new ArrayList<>();
3559-
for (Object obj : reply) {
3560-
slaves.add(BuilderFactory.STRING_MAP.build(obj));
3561-
}
3562-
return slaves;
3563-
}
3564-
35653569
@Override
35663570
public List<Map<String, String>> sentinelReplicas(final String masterName) {
35673571
client.sentinel(SentinelKeyword.REPLICAS, masterName);

src/main/java/redis/clients/jedis/commands/SentinelCommands.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ public interface SentinelCommands {
1717

1818
Long sentinelReset(String pattern);
1919

20+
/**
21+
* @deprecated Use {@link SentinelCommands#sentinelReplicas(java.lang.String)}.
22+
*/
23+
@Deprecated
2024
List<Map<String, String>> sentinelSlaves(String masterName);
2125

2226
List<Map<String, String>> sentinelReplicas(String masterName);

src/test/java/redis/clients/jedis/tests/JedisSentinelTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public void sentinel() {
6565
Integer.parseInt(masterHostAndPort.get(1)));
6666
assertEquals(master, masterFromSentinel);
6767

68-
List<Map<String, String>> slaves = j.sentinelSlaves(MASTER_NAME);
68+
List<Map<String, String>> slaves = j.sentinelReplicas(MASTER_NAME);
6969
assertTrue(!slaves.isEmpty());
7070
assertEquals(master.getPort(), Integer.parseInt(slaves.get(0).get("master-port")));
7171

src/test/java/redis/clients/jedis/tests/commands/SentinelCommandsTest.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,10 @@ public void masterMasters() {
4949
}
5050

5151
@Test
52-
public void replicasSlaves() {
53-
String runId;
52+
public void replicas() {
5453
try (Jedis sentinel = new Jedis(sentinel2_1)) {
5554
Map<String, String> details = sentinel.sentinelReplicas("mymaster").get(0);
5655
assertEquals(Integer.toString(replica2.getPort()), details.get("port"));
57-
runId = details.get("runid");
58-
}
59-
60-
try (Jedis sentinel2 = new Jedis(sentinel2_2)) {
61-
Map<String, String> details = sentinel2.sentinelSlaves("mymaster").get(0);
62-
assertEquals(runId, details.get("runid"));
6356
}
6457
}
6558
}

0 commit comments

Comments
 (0)