Skip to content

Commit a271ce7

Browse files
Merge branch 'main' into DOC-4756-sorted-set-async-examples
2 parents 06d1fe5 + fc7bffb commit a271ce7

33 files changed

+45
-50
lines changed

.github/workflows/stale-issues.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717
repo-token: ${{ secrets.GITHUB_TOKEN }}
1818
stale-issue-message: 'If you would like us to look at this issue, please provide the requested information. If the information is not provided within the next 30 days this issue will be closed.'
1919
stale-pr-message: 'Closing due to lack of requested feedback. If you would like us to look at this issue, please provide the requested information and we will re-open the issue.'
20-
days-before-stale: 365
21-
days-before-close: 30
20+
days-before-stale: 30
21+
days-before-close: 14
2222
stale-issue-label: "status: feedback-reminder"
2323
stale-pr-label: "status: feedback-reminder"
2424
operations-per-run: 10

src/main/java/io/lettuce/core/output/ClaimedMessagesOutput.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ public ClaimedMessagesOutput(RedisCodec<K, V> codec, K stream, boolean justId) {
7070
@Override
7171
public void set(ByteBuffer bytes) {
7272
if (startId == null) {
73-
startId = decodeAscii(bytes);
73+
startId = decodeString(bytes);
7474
return;
7575
}
7676

7777
if (id == null) {
78-
id = decodeAscii(bytes);
78+
id = decodeString(bytes);
7979
return;
8080
}
8181

src/main/java/io/lettuce/core/output/CommandOutput.java

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
package io.lettuce.core.output;
2121

2222
import java.nio.ByteBuffer;
23+
import java.nio.charset.StandardCharsets;
2324

2425
import io.lettuce.core.codec.RedisCodec;
2526
import io.lettuce.core.internal.LettuceAssert;
@@ -139,7 +140,7 @@ public void set(boolean value) {
139140
* @param error Error message.
140141
*/
141142
public void setError(ByteBuffer error) {
142-
this.error = decodeAscii(error);
143+
this.error = decodeString(error);
143144
}
144145

145146
/**
@@ -179,16 +180,8 @@ public void complete(int depth) {
179180
// nothing to do by default
180181
}
181182

182-
protected String decodeAscii(ByteBuffer bytes) {
183-
if (bytes == null) {
184-
return null;
185-
}
186-
187-
char[] chars = new char[bytes.remaining()];
188-
for (int i = 0; i < chars.length; i++) {
189-
chars[i] = (char) bytes.get();
190-
}
191-
return new String(chars);
183+
protected String decodeString(ByteBuffer bytes) {
184+
return bytes == null ? null : StandardCharsets.UTF_8.decode(bytes).toString();
192185
}
193186

194187
@Override

src/main/java/io/lettuce/core/output/DoubleListOutput.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public DoubleListOutput(RedisCodec<K, V> codec) {
4646

4747
@Override
4848
public void set(ByteBuffer bytes) {
49-
output.add(bytes != null ? parseDouble(decodeAscii(bytes)) : null);
49+
output.add(bytes != null ? parseDouble(decodeString(bytes)) : null);
5050
}
5151

5252
@Override

src/main/java/io/lettuce/core/output/DoubleOutput.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public DoubleOutput(RedisCodec<K, V> codec) {
4040

4141
@Override
4242
public void set(ByteBuffer bytes) {
43-
output = (bytes == null) ? null : parseDouble(decodeAscii(bytes));
43+
output = (bytes == null) ? null : parseDouble(decodeString(bytes));
4444
}
4545

4646
@Override

src/main/java/io/lettuce/core/output/EnumSetOutput.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void set(ByteBuffer bytes) {
5151
return;
5252
}
5353

54-
E enumConstant = resolve(enumValuePreprocessor.apply(decodeAscii(bytes)));
54+
E enumConstant = resolve(enumValuePreprocessor.apply(decodeString(bytes)));
5555

5656
if (enumConstant == null) {
5757
return;

src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void set(ByteBuffer bytes) {
3939
return;
4040
}
4141

42-
double value = (bytes == null) ? 0 : parseDouble(decodeAscii(bytes));
42+
double value = (bytes == null) ? 0 : parseDouble(decodeString(bytes));
4343
set(value);
4444
}
4545

src/main/java/io/lettuce/core/output/GeoCoordinatesValueListOutput.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void set(ByteBuffer bytes) {
4040
return;
4141
}
4242

43-
double value = parseDouble(decodeAscii(bytes));
43+
double value = parseDouble(decodeString(bytes));
4444
set(value);
4545
}
4646

src/main/java/io/lettuce/core/output/GeoWithinListOutput.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void set(ByteBuffer bytes) {
7373
return;
7474
}
7575

76-
double value = (bytes == null) ? 0 : parseDouble(decodeAscii(bytes));
76+
double value = (bytes == null) ? 0 : parseDouble(decodeString(bytes));
7777
set(value);
7878
}
7979

src/main/java/io/lettuce/core/output/JsonTypeListOutput.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public void set(ByteBuffer bytes) {
3535
multi(1);
3636
}
3737

38-
output.add(JsonType.fromString(decodeAscii(bytes)));
38+
output.add(JsonType.fromString(decodeString(bytes)));
3939
}
4040

4141
@Override

0 commit comments

Comments
 (0)