Skip to content

Fix bug issues/2651 ,wrong assignment in DefaultRedisSerializationContextBuilder.string #2652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix bug issues/2651 ,wrong assignment in DefaultRedisSerializationContextBuilder.string #2652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2ebbc9
`DefaultRedisSerializationContextBuilder.string()` should assign para…
imzhoukunqiang Jul 26, 2023
4ac662f
format code
imzhoukunqiang Jul 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...main/java/org/springframework/data/redis/serializer/DefaultRedisSerializationContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
* @author Mark Paluch
* @author Christoph Strobl
* @author Shyngys Sapraliyev
* @author Zhou KQ
* @since 2.0
*/
class DefaultRedisSerializationContext<K, V> implements RedisSerializationContext<K, V> {
Expand Down Expand Up @@ -127,7 +128,7 @@ public RedisSerializationContextBuilder<K, V> string(SerializationPair<String> t

Assert.notNull(tuple, "SerializationPair must not be null");

this.hashValueTuple = tuple;
this.stringTuple = tuple;
return this;
}

Expand Down
48 changes: 46 additions & 2 deletions ...st/java/org/springframework/data/redis/serializer/RedisSerializationContextUnitTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,19 @@
*/
package org.springframework.data.redis.serializer;

import static org.assertj.core.api.Assertions.*;
import org.junit.jupiter.api.Test;

import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;

import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.*;

/**
* Unit tests for {@link RedisSerializationContext}.
*
* @author Mark Paluch
* @author Christoph Strobl
* @author Zhou KQ
*/
class RedisSerializationContextUnitTests {

Expand Down Expand Up @@ -137,6 +139,48 @@ void shouldEncodeAndDecodeByteArrayValue() {
assertThat(deserialized).isEqualTo("hello".getBytes());
}

@Test
void shouldEncodeAndDecodeUtf8StringValue() {
RedisSerializationContext<String, String> serializationContext = RedisSerializationContext
.<String, String>newSerializationContext(StringRedisSerializer.UTF_8)
.string(StringRedisSerializer.UTF_8)
.build();
RedisSerializationContext.SerializationPair<String> serializationPair = serializationContext.getStringSerializationPair();

assertThat(serializationPair.write("üßØ"))
.isEqualTo(ByteBuffer.wrap("üßØ".getBytes(StandardCharsets.UTF_8)));
assertThat(serializationPair.read(ByteBuffer.wrap("üßØ".getBytes(StandardCharsets.UTF_8))))
.isEqualTo("üßØ");
}

@Test
void shouldEncodeAndDecodeAsciiStringValue() {
RedisSerializationContext<String, String> serializationContext = RedisSerializationContext
.<String, String>newSerializationContext(StringRedisSerializer.US_ASCII)
.string(StringRedisSerializer.US_ASCII)
.build();
RedisSerializationContext.SerializationPair<String> serializationPair = serializationContext.getStringSerializationPair();

assertThat(serializationPair.write("üßØ"))
.isEqualTo(ByteBuffer.wrap("???".getBytes(StandardCharsets.US_ASCII)));
assertThat(serializationPair.read(ByteBuffer.wrap("üßØ".getBytes(StandardCharsets.US_ASCII))))
.isEqualTo("???");
}

@Test
void shouldEncodeAndDecodeIso88591StringValue() {
RedisSerializationContext<String, String> serializationContext = RedisSerializationContext
.<String, String>newSerializationContext(StringRedisSerializer.ISO_8859_1)
.string(StringRedisSerializer.ISO_8859_1)
.build();
RedisSerializationContext.SerializationPair<String> serializationPair = serializationContext.getStringSerializationPair();

assertThat(serializationPair.write("üßØ"))
.isEqualTo(ByteBuffer.wrap("üßØ".getBytes(StandardCharsets.ISO_8859_1)));
assertThat(serializationPair.read(ByteBuffer.wrap("üßØ".getBytes(StandardCharsets.ISO_8859_1))))
.isEqualTo("üßØ");
}

private RedisSerializationContext<String, Long> createSerializationContext() {

return RedisSerializationContext.<String, Long> newSerializationContext() //
Expand Down