Skip to content

Commit 2e82b0e

Browse files
committed
Cleanup
1 parent e1de978 commit 2e82b0e

File tree

2 files changed

+4
-22
lines changed

2 files changed

+4
-22
lines changed

src/main/java/redis/clients/jedis/args/RawableFactory.java

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import static redis.clients.jedis.Protocol.toByteArray;
44

55
import java.util.Arrays;
6-
import java.util.Objects;
76
import redis.clients.jedis.util.SafeEncoder;
87

98
/**
@@ -97,29 +96,12 @@ public int hashCode() {
9796
/**
9897
* A {@link Rawable} wrapping a {@link String}.
9998
*/
100-
public static class RawString implements Rawable {
99+
public static class RawString extends Raw {
101100

102-
private final String str;
101+
// TODO: private final String str; ^ implements Rawable
103102

104103
public RawString(String str) {
105-
this.str = str;
106-
}
107-
108-
@Override
109-
public byte[] getRaw() {
110-
return SafeEncoder.encode(str);
111-
}
112-
113-
@Override
114-
public boolean equals(Object o) {
115-
if (this == o) return true;
116-
if (o == null || getClass() != o.getClass()) return false;
117-
return Objects.equals(str, ((RawString) o).str);
118-
}
119-
120-
@Override
121-
public int hashCode() {
122-
return Objects.hash(str);
104+
super(SafeEncoder.encode(str));
123105
}
124106
}
125107

src/test/java/redis/clients/jedis/modules/timeseries/TimeSeriesTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ public void testAdd() {
240240
assertEquals(expectedOverallMaxValues, values);
241241

242242
// MRANGE
243-
// assertEquals(Collections.emptyMap(), client.tsMRange(TSMRangeParams.multiRangeParams().filter("l=v"))); // TODO: uncomment
243+
assertEquals(Collections.emptyMap(), client.tsMRange(TSMRangeParams.multiRangeParams().filter("l=v"))); // TODO: uncomment
244244
try {
245245
client.tsMRange(TSMRangeParams.multiRangeParams(500L, 4600L).aggregation(AggregationType.COUNT, 1));
246246
fail();

0 commit comments

Comments
 (0)