Skip to content

Commit c0136df

Browse files
authored
Address Javadoc warnings (and related changes) (#2730)
1 parent d210d79 commit c0136df

File tree

8 files changed

+225
-259
lines changed

8 files changed

+225
-259
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -277,11 +277,6 @@ public List<byte[]> getBinaryMultiBulkReply() {
277277
return (List<byte[]>) readProtocolWithCheckingBroken();
278278
}
279279

280-
@Deprecated
281-
public List<Object> getRawObjectMultiBulkReply() {
282-
return getUnflushedObjectMultiBulkReply();
283-
}
284-
285280
@SuppressWarnings("unchecked")
286281
public List<Object> getUnflushedObjectMultiBulkReply() {
287282
return (List<Object>) readProtocolWithCheckingBroken();

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

Lines changed: 213 additions & 214 deletions
Large diffs are not rendered by default.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ public List<Object> syncAndReturnAll() {
9090
}
9191
}
9292

93-
@Deprecated
9493
public final boolean hasPipelinedResponse() {
9594
return getPipelinedResponseLength() > 0;
9695
}

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,6 @@ public String sentinelMyId() {
256256
* 24) "2"
257257
*
258258
* </pre>
259-
* @return
260259
*/
261260
@Override
262261
public List<Map<String, String>> sentinelMasters() {
@@ -299,7 +298,6 @@ public List<String> sentinelGetMasterAddrByName(String masterName) {
299298
* (integer) 1
300299
* </pre>
301300
* @param pattern
302-
* @return
303301
*/
304302
@Override
305303
public Long sentinelReset(String pattern) {
@@ -340,7 +338,6 @@ public Long sentinelReset(String pattern) {
340338
* 28) "100"
341339
* </pre>
342340
* @param masterName
343-
* @return
344341
*/
345342
@Override
346343
public List<Map<String, String>> sentinelSlaves(String masterName) {

src/main/java/redis/clients/jedis/params/ScanParams.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ public ScanParams match(final byte[] pattern) {
2727

2828
/**
2929
* @see <a href="https://redis.io/commands/scan#the-match-option">MATCH option in Redis documentation</a>
30-
*
31-
* @param pattern
32-
* @return
3330
*/
3431
public ScanParams match(final String pattern) {
3532
params.put(MATCH, ByteBuffer.wrap(SafeEncoder.encode(pattern)));
@@ -38,9 +35,6 @@ public ScanParams match(final String pattern) {
3835

3936
/**
4037
* @see <a href="https://redis.io/commands/scan#the-count-option">COUNT option in Redis documentation</a>
41-
*
42-
* @param count
43-
* @return
4438
*/
4539
public ScanParams count(final Integer count) {
4640
params.put(COUNT, ByteBuffer.wrap(Protocol.toByteArray(count)));

src/main/java/redis/clients/jedis/params/SetParams.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,6 @@ public static SetParams setParams() {
2222
return new SetParams();
2323
}
2424

25-
/**
26-
* Set the specified expire time, in seconds.
27-
* @param secondsToExpire
28-
* @return SetParams
29-
* @deprecated Use {@link #ex(long)}.
30-
*/
31-
@Deprecated
32-
public SetParams ex(int secondsToExpire) {
33-
return ex((long) secondsToExpire);
34-
}
35-
3625
/**
3726
* Set the specified expire time, in seconds.
3827
* @param secondsToExpire

src/main/java/redis/clients/jedis/params/SortingParams.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import redis.clients.jedis.util.SafeEncoder;
1919

2020
/**
21-
* Builder Class for {@link Jedis#sort(String, SortingParams) SORT} Parameters.
21+
* Builder Class for {@code SORT} command parameters.
2222
*/
2323
public class SortingParams implements IParams {
2424
private final List<byte[]> params = new ArrayList<>();

src/main/java/redis/clients/jedis/params/ZParams.java

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,48 +7,41 @@
77
import java.util.List;
88

99
import redis.clients.jedis.CommandArguments;
10-
import redis.clients.jedis.Protocol;
10+
import redis.clients.jedis.args.Rawable;
1111
import redis.clients.jedis.util.SafeEncoder;
1212

1313
public class ZParams implements IParams {
1414

15-
public enum Aggregate {
15+
public enum Aggregate implements Rawable {
16+
1617
SUM, MIN, MAX;
1718

18-
/**
19-
* @deprecated This will be private in future. Use {@link #getRaw()}.
20-
*/
21-
@Deprecated
22-
public final byte[] raw;
19+
private final byte[] raw;
2320

24-
Aggregate() {
21+
private Aggregate() {
2522
raw = SafeEncoder.encode(name());
2623
}
2724

25+
@Override
2826
public byte[] getRaw() {
2927
return raw;
3028
}
3129
}
3230

33-
private final List<byte[]> params = new ArrayList<>();
31+
private final List<Object> params = new ArrayList<>();
3432

35-
/**
36-
* Set weights.
37-
* @param weights weights.
38-
* @return
39-
*/
4033
public ZParams weights(final double... weights) {
41-
params.add(WEIGHTS.getRaw());
34+
params.add(WEIGHTS);
4235
for (final double weight : weights) {
43-
params.add(Protocol.toByteArray(weight));
36+
params.add(weight);
4437
}
4538

4639
return this;
4740
}
4841

4942
public ZParams aggregate(final Aggregate aggregate) {
50-
params.add(AGGREGATE.getRaw());
51-
params.add(aggregate.raw);
43+
params.add(AGGREGATE);
44+
params.add(aggregate);
5245
return this;
5346
}
5447

0 commit comments

Comments
 (0)