Skip to content

Commit 665569b

Browse files
Move geo shapes to domain specific package.
Original Pull Request: #2113
1 parent b00bd4b commit 665569b

26 files changed

+819
-527
lines changed

src/main/java/org/springframework/data/redis/connection/DefaultStringRedisConnection.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@
5353
import org.springframework.data.redis.core.ScanOptions;
5454
import org.springframework.data.redis.core.types.Expiration;
5555
import org.springframework.data.redis.core.types.RedisClientInfo;
56+
import org.springframework.data.redis.domain.geo.GeoReference;
57+
import org.springframework.data.redis.domain.geo.GeoReference.GeoMemberReference;
58+
import org.springframework.data.redis.domain.geo.GeoShape;
5659
import org.springframework.data.redis.serializer.RedisSerializer;
5760
import org.springframework.data.redis.serializer.StringRedisSerializer;
5861
import org.springframework.lang.Nullable;
@@ -2122,9 +2125,9 @@ private byte[] serialize(String data) {
21222125

21232126
@SuppressWarnings("unchecked")
21242127
private GeoReference<byte[]> serialize(GeoReference<String> data) {
2125-
return data instanceof GeoReference.GeoSearchMemberReference
2128+
return data instanceof GeoReference.GeoMemberReference
21262129
? GeoReference
2127-
.fromMember(serializer.serialize(((GeoReference.GeoSearchMemberReference<String>) data).getMember()))
2130+
.fromMember(serializer.serialize(((GeoMemberReference<String>) data).getMember()))
21282131
: (GeoReference) data;
21292132
}
21302133

src/main/java/org/springframework/data/redis/connection/DefaultedRedisConnection.java

+2
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@
4444
import org.springframework.data.redis.core.ScanOptions;
4545
import org.springframework.data.redis.core.types.Expiration;
4646
import org.springframework.data.redis.core.types.RedisClientInfo;
47+
import org.springframework.data.redis.domain.geo.GeoReference;
48+
import org.springframework.data.redis.domain.geo.GeoShape;
4749
import org.springframework.lang.Nullable;
4850

4951
/**

src/main/java/org/springframework/data/redis/connection/ReactiveGeoCommands.java

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
import static org.springframework.data.redis.connection.RedisGeoCommands.*;
1919

20+
import org.springframework.data.redis.domain.geo.GeoReference;
21+
import org.springframework.data.redis.domain.geo.GeoShape;
2022
import reactor.core.publisher.Flux;
2123
import reactor.core.publisher.Mono;
2224

0 commit comments

Comments
 (0)