From 30c777b85f6d5d192c246d62dac3726147df832d Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Wed, 25 May 2016 14:02:41 +0200 Subject: [PATCH 1/2] DATAREDIS-514 - Unify georadius capitalization. Prepare issue branch. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e6d868411f..26f3eac741 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-redis - 1.8.0.BUILD-SNAPSHOT + 1.8.0.DATAREDIS-514-SNAPSHOT Spring Data Redis From 0adc9038fab58c1a7a0b274562a1aec1d87bbada Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Wed, 25 May 2016 14:15:39 +0200 Subject: [PATCH 2/2] DATAREDIS-514 - Unify geoRadius capitalization. Unify capitalization of geoRadius to match other geo prefixed operations. --- .../DefaultStringRedisConnection.java | 32 +++++++++---------- .../connection/StringRedisConnection.java | 10 +++--- .../jedis/JedisClusterConnection.java | 10 +++--- .../connection/jedis/JedisConnection.java | 12 ++++--- .../connection/jredis/JredisConnection.java | 10 +++--- .../connection/lettuce/LettuceConnection.java | 10 +++--- .../redis/connection/srp/SrpConnection.java | 10 +++--- .../data/redis/core/BoundGeoOperations.java | 10 +++--- .../redis/core/DefaultBoundGeoOperations.java | 30 ++++++++--------- .../data/redis/core/DefaultGeoOperations.java | 20 ++++++------ .../data/redis/core/GeoOperations.java | 10 +++--- .../AbstractConnectionIntegrationTests.java | 14 ++++---- .../DefaultStringRedisConnectionTests.java | 12 +++---- .../redis/core/DefaultGeoOperationsTests.java | 16 +++++----- 14 files changed, 105 insertions(+), 101 deletions(-) diff --git a/src/main/java/org/springframework/data/redis/connection/DefaultStringRedisConnection.java b/src/main/java/org/springframework/data/redis/connection/DefaultStringRedisConnection.java index 68197780c8..4e4b4ecd31 100644 --- a/src/main/java/org/springframework/data/redis/connection/DefaultStringRedisConnection.java +++ b/src/main/java/org/springframework/data/redis/connection/DefaultStringRedisConnection.java @@ -2499,10 +2499,10 @@ public List geoPos(String key, String... members) { /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.StringRedisConnection#georadius(java.lang.String, org.springframework.data.geo.Circle) + * @see org.springframework.data.redis.connection.StringRedisConnection#geoRadius(java.lang.String, org.springframework.data.geo.Circle) */ @Override - public GeoResults> georadius(String key, Circle within) { + public GeoResults> geoRadius(String key, Circle within) { GeoResults> result = delegate.geoRadius(serialize(key), within); if (isFutureConversion()) { @@ -2514,10 +2514,10 @@ public GeoResults> georadius(String key, Circle within) { /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.StringRedisConnection#georadius(java.lang.String, org.springframework.data.geo.Circle, org.springframework.data.redis.core.GeoRadiusCommandArgs) + * @see org.springframework.data.redis.connection.StringRedisConnection#geoRadius(java.lang.String, org.springframework.data.geo.Circle, org.springframework.data.redis.core.GeoRadiusCommandArgs) */ @Override - public GeoResults> georadius(String key, Circle within, GeoRadiusCommandArgs args) { + public GeoResults> geoRadius(String key, Circle within, GeoRadiusCommandArgs args) { GeoResults> result = delegate.geoRadius(serialize(key), within, args); if (isFutureConversion()) { @@ -2528,19 +2528,19 @@ public GeoResults> georadius(String key, Circle within, GeoR /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.StringRedisConnection#georadiusByMember(java.lang.String, java.lang.String, double) + * @see org.springframework.data.redis.connection.StringRedisConnection#geoRadiusByMember(java.lang.String, java.lang.String, double) */ @Override - public GeoResults> georadiusByMember(String key, String member, double radius) { - return georadiusByMember(key, member, new Distance(radius, DistanceUnit.METERS)); + public GeoResults> geoRadiusByMember(String key, String member, double radius) { + return geoRadiusByMember(key, member, new Distance(radius, DistanceUnit.METERS)); } /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.StringRedisConnection#georadiusByMember(java.lang.String, java.lang.String, org.springframework.data.geo.Distance) + * @see org.springframework.data.redis.connection.StringRedisConnection#geoRadiusByMember(java.lang.String, java.lang.String, org.springframework.data.geo.Distance) */ @Override - public GeoResults> georadiusByMember(String key, String member, Distance radius) { + public GeoResults> geoRadiusByMember(String key, String member, Distance radius) { GeoResults> result = delegate.geoRadiusByMember(serialize(key), serialize(member), radius); if (isFutureConversion()) { @@ -2551,10 +2551,10 @@ public GeoResults> georadiusByMember(String key, String memb /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.StringRedisConnection#georadiusByMember(java.lang.String, java.lang.String, org.springframework.data.geo.Distance, org.springframework.data.redis.core.GeoRadiusCommandArgs) + * @see org.springframework.data.redis.connection.StringRedisConnection#geoRadiusByMember(java.lang.String, java.lang.String, org.springframework.data.geo.Distance, org.springframework.data.redis.core.GeoRadiusCommandArgs) */ @Override - public GeoResults> georadiusByMember(String key, String member, Distance radius, + public GeoResults> geoRadiusByMember(String key, String member, Distance radius, GeoRadiusCommandArgs args) { GeoResults> result = delegate.geoRadiusByMember(serialize(key), serialize(member), radius, @@ -2567,7 +2567,7 @@ public GeoResults> georadiusByMember(String key, String memb /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.RedisGeoCommands#georadius(byte[], org.springframework.data.geo.Circle) + * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadius(byte[], org.springframework.data.geo.Circle) */ @Override public GeoResults> geoRadius(byte[] key, Circle within) { @@ -2581,7 +2581,7 @@ public GeoResults> geoRadius(byte[] key, Circle within) { /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.RedisGeoCommands#georadius(byte[], org.springframework.data.geo.Circle, org.springframework.data.redis.core.GeoRadiusCommandArgs) + * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadius(byte[], org.springframework.data.geo.Circle, org.springframework.data.redis.core.GeoRadiusCommandArgs) */ @Override public GeoResults> geoRadius(byte[] key, Circle within, GeoRadiusCommandArgs args) { @@ -2595,7 +2595,7 @@ public GeoResults> geoRadius(byte[] key, Circle within, GeoR /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.RedisGeoCommands#georadiusByMember(byte[], byte[], double) + * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadiusByMember(byte[], byte[], double) */ @Override public GeoResults> geoRadiusByMember(byte[] key, byte[] member, double radius) { @@ -2604,7 +2604,7 @@ public GeoResults> geoRadiusByMember(byte[] key, byte[] memb /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.RedisGeoCommands#georadiusByMember(byte[], byte[], org.springframework.data.geo.Distance) + * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadiusByMember(byte[], byte[], org.springframework.data.geo.Distance) */ @Override public GeoResults> geoRadiusByMember(byte[] key, byte[] member, Distance radius) { @@ -2618,7 +2618,7 @@ public GeoResults> geoRadiusByMember(byte[] key, byte[] memb /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.RedisGeoCommands#georadiusByMember(byte[], byte[], org.springframework.data.geo.Distance, org.springframework.data.redis.core.GeoRadiusCommandArgs) + * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadiusByMember(byte[], byte[], org.springframework.data.geo.Distance, org.springframework.data.redis.core.GeoRadiusCommandArgs) */ @Override public GeoResults> geoRadiusByMember(byte[] key, byte[] member, Distance radius, diff --git a/src/main/java/org/springframework/data/redis/connection/StringRedisConnection.java b/src/main/java/org/springframework/data/redis/connection/StringRedisConnection.java index 0d95891f3a..a6682d5152 100644 --- a/src/main/java/org/springframework/data/redis/connection/StringRedisConnection.java +++ b/src/main/java/org/springframework/data/redis/connection/StringRedisConnection.java @@ -732,7 +732,7 @@ public interface StringTuple extends Tuple { * @see http://redis.io/commands/georadius * @since 1.8 */ - GeoResults> georadius(String key, Circle within); + GeoResults> geoRadius(String key, Circle within); /** * Get the {@literal member}s within the boundaries of a given {@link Circle} applying {@link GeoRadiusCommandArgs}. @@ -744,7 +744,7 @@ public interface StringTuple extends Tuple { * @see http://redis.io/commands/georadius * @since 1.8 */ - GeoResults> georadius(String key, Circle within, GeoRadiusCommandArgs args); + GeoResults> geoRadius(String key, Circle within, GeoRadiusCommandArgs args); /** * Get the {@literal member}s within the circle defined by the {@literal members} coordinates and given @@ -757,7 +757,7 @@ public interface StringTuple extends Tuple { * @see http://redis.io/commands/georadiusbymember * @since 1.8 */ - GeoResults> georadiusByMember(String key, String member, double radius); + GeoResults> geoRadiusByMember(String key, String member, double radius); /** * Get the {@literal member}s within the circle defined by the {@literal members} coordinates and given @@ -770,7 +770,7 @@ public interface StringTuple extends Tuple { * @see http://redis.io/commands/georadiusbymember * @since 1.8 */ - GeoResults> georadiusByMember(String key, String member, Distance radius); + GeoResults> geoRadiusByMember(String key, String member, Distance radius); /** * Get the {@literal member}s within the circle defined by the {@literal members} coordinates and given @@ -784,7 +784,7 @@ public interface StringTuple extends Tuple { * @see http://redis.io/commands/georadiusbymember * @since 1.8 */ - GeoResults> georadiusByMember(String key, String member, Distance radius, + GeoResults> geoRadiusByMember(String key, String member, Distance radius, GeoRadiusCommandArgs args); /** diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterConnection.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterConnection.java index 7fdfd6979a..e3b272bb5c 100644 --- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterConnection.java +++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterConnection.java @@ -2675,7 +2675,7 @@ public List geoPos(byte[] key, byte[]... members) { /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.RedisGeoCommands#georadius(byte[], org.springframework.data.geo.Circle) + * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadius(byte[], org.springframework.data.geo.Circle) */ @Override public GeoResults> geoRadius(byte[] key, Circle within) { @@ -2694,7 +2694,7 @@ public GeoResults> geoRadius(byte[] key, Circle within) { /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.RedisGeoCommands#georadius(byte[], org.springframework.data.geo.Circle, org.springframework.data.redis.core.GeoRadiusCommandArgs) + * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadius(byte[], org.springframework.data.geo.Circle, org.springframework.data.redis.core.GeoRadiusCommandArgs) */ @Override public GeoResults> geoRadius(byte[] key, Circle within, GeoRadiusCommandArgs args) { @@ -2717,7 +2717,7 @@ public GeoResults> geoRadius(byte[] key, Circle within, GeoR /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.RedisGeoCommands#georadiusByMember(byte[], byte[], double) + * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadiusByMember(byte[], byte[], double) */ @Override public GeoResults> geoRadiusByMember(byte[] key, byte[] member, double radius) { @@ -2726,7 +2726,7 @@ public GeoResults> geoRadiusByMember(byte[] key, byte[] memb /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.RedisGeoCommands#georadiusByMember(byte[], byte[], org.springframework.data.geo.Distance) + * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadiusByMember(byte[], byte[], org.springframework.data.geo.Distance) */ @Override public GeoResults> geoRadiusByMember(byte[] key, byte[] member, Distance radius) { @@ -2746,7 +2746,7 @@ public GeoResults> geoRadiusByMember(byte[] key, byte[] memb /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.RedisGeoCommands#georadiusByMember(byte[], byte[], org.springframework.data.geo.Distance, org.springframework.data.redis.core.GeoRadiusCommandArgs) + * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadiusByMember(byte[], byte[], org.springframework.data.geo.Distance, org.springframework.data.redis.core.GeoRadiusCommandArgs) */ @Override public GeoResults> geoRadiusByMember(byte[] key, byte[] member, Distance radius, diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java index 41463c3f5b..7af4719ade 100644 --- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java +++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java @@ -3321,7 +3321,7 @@ public List geoPos(byte[] key, byte[]... members) { /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.RedisGeoCommands#georadius(byte[], org.springframework.data.geo.Circle) + * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadius(byte[], org.springframework.data.geo.Circle) */ @Override public GeoResults> geoRadius(byte[] key, Circle within) { @@ -3358,7 +3358,7 @@ public GeoResults> geoRadius(byte[] key, Circle within) { /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.RedisGeoCommands#georadius(byte[], org.springframework.data.geo.Circle, org.springframework.data.redis.core.GeoRadiusCommandArgs) + * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadius(byte[], org.springframework.data.geo.Circle, org.springframework.data.redis.core.GeoRadiusCommandArgs) */ @Override public GeoResults> geoRadius(byte[] key, Circle within, GeoRadiusCommandArgs args) { @@ -3394,7 +3394,7 @@ public GeoResults> geoRadius(byte[] key, Circle within, GeoR /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.RedisGeoCommands#georadiusByMember(byte[], byte[], double) + * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadiusByMember(byte[], byte[], double) */ @Override public GeoResults> geoRadiusByMember(byte[] key, byte[] member, double radius) { @@ -3403,7 +3403,7 @@ public GeoResults> geoRadiusByMember(byte[] key, byte[] memb /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.RedisGeoCommands#georadiusByMember(byte[], byte[], org.springframework.data.geo.Distance) + * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadiusByMember(byte[], byte[], org.springframework.data.geo.Distance) */ @Override public GeoResults> geoRadiusByMember(byte[] key, byte[] member, Distance radius) { @@ -3432,6 +3432,10 @@ public GeoResults> geoRadiusByMember(byte[] key, byte[] memb } } + /* + * (non-Javadoc) + * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadiusByMember(byte[], byte[], org.springframework.data.geo.Distance, org.springframework.data.redis.connection.RedisGeoCommands.GeoRadiusCommandArgs) + */ @Override public GeoResults> geoRadiusByMember(byte[] key, byte[] member, Distance radius, GeoRadiusCommandArgs args) { diff --git a/src/main/java/org/springframework/data/redis/connection/jredis/JredisConnection.java b/src/main/java/org/springframework/data/redis/connection/jredis/JredisConnection.java index 309d3b5ecf..d67f703f94 100644 --- a/src/main/java/org/springframework/data/redis/connection/jredis/JredisConnection.java +++ b/src/main/java/org/springframework/data/redis/connection/jredis/JredisConnection.java @@ -1275,7 +1275,7 @@ public List geoPos(byte[] key, byte[]... members) { /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.RedisGeoCommands#georadius(byte[], org.springframework.data.geo.Circle) + * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadius(byte[], org.springframework.data.geo.Circle) */ @Override public GeoResults> geoRadius(byte[] key, Circle within) { @@ -1284,7 +1284,7 @@ public GeoResults> geoRadius(byte[] key, Circle within) { /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.RedisGeoCommands#georadius(byte[], org.springframework.data.geo.Circle, org.springframework.data.redis.core.GeoRadiusCommandArgs) + * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadius(byte[], org.springframework.data.geo.Circle, org.springframework.data.redis.core.GeoRadiusCommandArgs) */ @Override public GeoResults> geoRadius(byte[] key, Circle within, GeoRadiusCommandArgs args) { @@ -1293,7 +1293,7 @@ public GeoResults> geoRadius(byte[] key, Circle within, GeoR /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.RedisGeoCommands#georadiusByMember(byte[], byte[], double) + * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadiusByMember(byte[], byte[], double) */ @Override public GeoResults> geoRadiusByMember(byte[] key, byte[] member, double radius) { @@ -1302,7 +1302,7 @@ public GeoResults> geoRadiusByMember(byte[] key, byte[] memb /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.RedisGeoCommands#georadiusByMember(byte[], byte[], org.springframework.data.geo.Distance) + * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadiusByMember(byte[], byte[], org.springframework.data.geo.Distance) */ @Override public GeoResults> geoRadiusByMember(byte[] key, byte[] member, Distance radius) { @@ -1311,7 +1311,7 @@ public GeoResults> geoRadiusByMember(byte[] key, byte[] memb /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.RedisGeoCommands#georadiusByMember(byte[], byte[], org.springframework.data.geo.Distance, org.springframework.data.redis.core.GeoRadiusCommandArgs) + * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadiusByMember(byte[], byte[], org.springframework.data.geo.Distance, org.springframework.data.redis.core.GeoRadiusCommandArgs) */ @Override public GeoResults> geoRadiusByMember(byte[] key, byte[] member, Distance radius, diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java index efa8fa785e..af58927053 100644 --- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java +++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java @@ -3301,7 +3301,7 @@ public List geoPos(byte[] key, byte[]... members) { /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.RedisGeoCommands#georadius(byte[], org.springframework.data.geo.Circle) + * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadius(byte[], org.springframework.data.geo.Circle) */ @Override public GeoResults> geoRadius(byte[] key, Circle within) { @@ -3337,7 +3337,7 @@ public GeoResults> geoRadius(byte[] key, Circle within) { /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.RedisGeoCommands#georadius(byte[], org.springframework.data.geo.Circle, org.springframework.data.redis.core.GeoRadiusCommandArgs) + * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadius(byte[], org.springframework.data.geo.Circle, org.springframework.data.redis.core.GeoRadiusCommandArgs) */ @Override public GeoResults> geoRadius(byte[] key, Circle within, GeoRadiusCommandArgs args) { @@ -3373,7 +3373,7 @@ public GeoResults> geoRadius(byte[] key, Circle within, GeoR /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.RedisGeoCommands#georadiusByMember(byte[], byte[], double) + * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadiusByMember(byte[], byte[], double) */ @Override public GeoResults> geoRadiusByMember(byte[] key, byte[] member, double radius) { @@ -3382,7 +3382,7 @@ public GeoResults> geoRadiusByMember(byte[] key, byte[] memb /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.RedisGeoCommands#georadiusByMember(byte[], byte[], double, org.springframework.data.geo.Metric) + * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadiusByMember(byte[], byte[], double, org.springframework.data.geo.Metric) */ @Override public GeoResults> geoRadiusByMember(byte[] key, byte[] member, Distance radius) { @@ -3414,7 +3414,7 @@ public GeoResults> geoRadiusByMember(byte[] key, byte[] memb /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.RedisGeoCommands#georadiusByMember(byte[], byte[], org.springframework.data.geo.Distance, org.springframework.data.redis.core.GeoRadiusCommandArgs) + * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadiusByMember(byte[], byte[], org.springframework.data.geo.Distance, org.springframework.data.redis.core.GeoRadiusCommandArgs) */ @Override public GeoResults> geoRadiusByMember(byte[] key, byte[] member, Distance radius, diff --git a/src/main/java/org/springframework/data/redis/connection/srp/SrpConnection.java b/src/main/java/org/springframework/data/redis/connection/srp/SrpConnection.java index eac4482c01..d02b92660d 100644 --- a/src/main/java/org/springframework/data/redis/connection/srp/SrpConnection.java +++ b/src/main/java/org/springframework/data/redis/connection/srp/SrpConnection.java @@ -2321,7 +2321,7 @@ public List geoPos(byte[] key, byte[]... members) { /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.RedisGeoCommands#georadius(byte[], org.springframework.data.geo.Circle) + * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadius(byte[], org.springframework.data.geo.Circle) */ @Override public GeoResults> geoRadius(byte[] key, Circle within) { @@ -2330,7 +2330,7 @@ public GeoResults> geoRadius(byte[] key, Circle within) { /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.RedisGeoCommands#georadius(byte[], org.springframework.data.geo.Circle, org.springframework.data.redis.core.GeoRadiusCommandArgs) + * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadius(byte[], org.springframework.data.geo.Circle, org.springframework.data.redis.core.GeoRadiusCommandArgs) */ @Override public GeoResults> geoRadius(byte[] key, Circle within, GeoRadiusCommandArgs args) { @@ -2339,7 +2339,7 @@ public GeoResults> geoRadius(byte[] key, Circle within, GeoR /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.RedisGeoCommands#georadiusByMember(byte[], byte[], double) + * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadiusByMember(byte[], byte[], double) */ @Override public GeoResults> geoRadiusByMember(byte[] key, byte[] member, double radius) { @@ -2348,7 +2348,7 @@ public GeoResults> geoRadiusByMember(byte[] key, byte[] memb /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.RedisGeoCommands#georadiusByMember(byte[], byte[], org.springframework.data.geo.Distance) + * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadiusByMember(byte[], byte[], org.springframework.data.geo.Distance) */ @Override public GeoResults> geoRadiusByMember(byte[] key, byte[] member, Distance radius) { @@ -2357,7 +2357,7 @@ public GeoResults> geoRadiusByMember(byte[] key, byte[] memb /* * (non-Javadoc) - * @see org.springframework.data.redis.connection.RedisGeoCommands#georadiusByMember(byte[], byte[], org.springframework.data.geo.Distance, org.springframework.data.redis.core.GeoRadiusCommandArgs) + * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadiusByMember(byte[], byte[], org.springframework.data.geo.Distance, org.springframework.data.redis.core.GeoRadiusCommandArgs) */ @Override public GeoResults> geoRadiusByMember(byte[] key, byte[] member, Distance radius, diff --git a/src/main/java/org/springframework/data/redis/core/BoundGeoOperations.java b/src/main/java/org/springframework/data/redis/core/BoundGeoOperations.java index 0546c5db1d..ed4f0162d3 100644 --- a/src/main/java/org/springframework/data/redis/core/BoundGeoOperations.java +++ b/src/main/java/org/springframework/data/redis/core/BoundGeoOperations.java @@ -118,7 +118,7 @@ public interface BoundGeoOperations extends BoundKeyOperations { * @return never {@literal null}. * @see http://redis.io/commands/georadius */ - GeoResults> georadius(Circle within); + GeoResults> geoRadius(Circle within); /** * Get the {@literal member}s within the boundaries of a given {@link Circle} applying {@link GeoRadiusCommandArgs}. @@ -128,7 +128,7 @@ public interface BoundGeoOperations extends BoundKeyOperations { * @return never {@literal null}. * @see http://redis.io/commands/georadius */ - GeoResults> georadius(Circle within, GeoRadiusCommandArgs args); + GeoResults> geoRadius(Circle within, GeoRadiusCommandArgs args); /** * Get the {@literal member}s within the circle defined by the {@literal members} coordinates and given @@ -139,7 +139,7 @@ public interface BoundGeoOperations extends BoundKeyOperations { * @return never {@literal null}. * @see http://redis.io/commands/georadiusbymember */ - GeoResults> georadiusByMember(K key, M member, double radius); + GeoResults> geoRadiusByMember(K key, M member, double radius); /** * Get the {@literal member}s within the circle defined by the {@literal members} coordinates and given @@ -150,7 +150,7 @@ public interface BoundGeoOperations extends BoundKeyOperations { * @return never {@literal null}. * @see http://redis.io/commands/georadiusbymember */ - GeoResults> georadiusByMember(M member, Distance distance); + GeoResults> geoRadiusByMember(M member, Distance distance); /** * Get the {@literal member}s within the circle defined by the {@literal members} coordinates and given @@ -162,7 +162,7 @@ public interface BoundGeoOperations extends BoundKeyOperations { * @return never {@literal null}. * @see http://redis.io/commands/georadiusbymember */ - GeoResults> georadiusByMember(M member, Distance distance, GeoRadiusCommandArgs args); + GeoResults> geoRadiusByMember(M member, Distance distance, GeoRadiusCommandArgs args); /** * Remove the {@literal member}s. diff --git a/src/main/java/org/springframework/data/redis/core/DefaultBoundGeoOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultBoundGeoOperations.java index d19991874b..49be1c3ca0 100644 --- a/src/main/java/org/springframework/data/redis/core/DefaultBoundGeoOperations.java +++ b/src/main/java/org/springframework/data/redis/core/DefaultBoundGeoOperations.java @@ -124,47 +124,47 @@ public List geoPos(M... members) { /* * (non-Javadoc) - * @see org.springframework.data.redis.core.BoundGeoOperations#georadius(org.springframework.data.geo.Circle) + * @see org.springframework.data.redis.core.BoundGeoOperations#geoRadius(org.springframework.data.geo.Circle) */ @Override - public GeoResults> georadius(Circle within) { - return ops.georadius(getKey(), within); + public GeoResults> geoRadius(Circle within) { + return ops.geoRadius(getKey(), within); } /* * (non-Javadoc) - * @see org.springframework.data.redis.core.BoundGeoOperations#georadius(org.springframework.data.geo.Circle, org.springframework.data.redis.core.GeoRadiusCommandArgs) + * @see org.springframework.data.redis.core.BoundGeoOperations#geoRadius(org.springframework.data.geo.Circle, org.springframework.data.redis.core.GeoRadiusCommandArgs) */ @Override - public GeoResults> georadius(Circle within, GeoRadiusCommandArgs param) { - return ops.georadius(getKey(), within, param); + public GeoResults> geoRadius(Circle within, GeoRadiusCommandArgs param) { + return ops.geoRadius(getKey(), within, param); } /* * (non-Javadoc) - * @see org.springframework.data.redis.core.BoundGeoOperations#georadiusByMember(java.lang.Object, java.lang.Object, double) + * @see org.springframework.data.redis.core.BoundGeoOperations#geoRadiusByMember(java.lang.Object, java.lang.Object, double) */ @Override - public GeoResults> georadiusByMember(K key, M member, double radius) { - return ops.georadiusByMember(getKey(), member, radius); + public GeoResults> geoRadiusByMember(K key, M member, double radius) { + return ops.geoRadiusByMember(getKey(), member, radius); } /* * (non-Javadoc) - * @see org.springframework.data.redis.core.BoundGeoOperations#georadiusByMember(java.lang.Object, org.springframework.data.geo.Distance) + * @see org.springframework.data.redis.core.BoundGeoOperations#geoRadiusByMember(java.lang.Object, org.springframework.data.geo.Distance) */ @Override - public GeoResults> georadiusByMember(M member, Distance distance) { - return ops.georadiusByMember(getKey(), member, distance); + public GeoResults> geoRadiusByMember(M member, Distance distance) { + return ops.geoRadiusByMember(getKey(), member, distance); } /* * (non-Javadoc) - * @see org.springframework.data.redis.core.BoundGeoOperations#georadiusByMember(java.lang.Object, org.springframework.data.geo.Distance, org.springframework.data.redis.core.GeoRadiusCommandArgs) + * @see org.springframework.data.redis.core.BoundGeoOperations#geoRadiusByMember(java.lang.Object, org.springframework.data.geo.Distance, org.springframework.data.redis.core.GeoRadiusCommandArgs) */ @Override - public GeoResults> georadiusByMember(M member, Distance distance, GeoRadiusCommandArgs param) { - return ops.georadiusByMember(getKey(), member, distance, param); + public GeoResults> geoRadiusByMember(M member, Distance distance, GeoRadiusCommandArgs param) { + return ops.geoRadiusByMember(getKey(), member, distance, param); } /* diff --git a/src/main/java/org/springframework/data/redis/core/DefaultGeoOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultGeoOperations.java index 710e764029..98d87e1cc2 100644 --- a/src/main/java/org/springframework/data/redis/core/DefaultGeoOperations.java +++ b/src/main/java/org/springframework/data/redis/core/DefaultGeoOperations.java @@ -187,10 +187,10 @@ public List doInRedis(RedisConnection connection) { /* * (non-Javadoc) - * @see org.springframework.data.redis.core.GeoOperations#georadius(java.lang.Object, org.springframework.data.geo.Circle) + * @see org.springframework.data.redis.core.GeoOperations#geoRadius(java.lang.Object, org.springframework.data.geo.Circle) */ @Override - public GeoResults> georadius(K key, final Circle within) { + public GeoResults> geoRadius(K key, final Circle within) { final byte[] rawKey = rawKey(key); @@ -206,10 +206,10 @@ public GeoResults> doInRedis(RedisConnection connection) { /* * (non-Javadoc) - * @see org.springframework.data.redis.core.GeoOperations#georadius(java.lang.Object, org.springframework.data.geo.Circle, org.springframework.data.redis.core.GeoRadiusCommandArgs) + * @see org.springframework.data.redis.core.GeoOperations#geoRadius(java.lang.Object, org.springframework.data.geo.Circle, org.springframework.data.redis.core.GeoRadiusCommandArgs) */ @Override - public GeoResults> georadius(K key, final Circle within, final GeoRadiusCommandArgs args) { + public GeoResults> geoRadius(K key, final Circle within, final GeoRadiusCommandArgs args) { final byte[] rawKey = rawKey(key); @@ -225,10 +225,10 @@ public GeoResults> doInRedis(RedisConnection connection) { /* * (non-Javadoc) - * @see org.springframework.data.redis.core.GeoOperations#georadiusByMember(java.lang.Object, java.lang.Object, double) + * @see org.springframework.data.redis.core.GeoOperations#geoRadiusByMember(java.lang.Object, java.lang.Object, double) */ @Override - public GeoResults> georadiusByMember(K key, M member, final double radius) { + public GeoResults> geoRadiusByMember(K key, M member, final double radius) { final byte[] rawKey = rawKey(key); final byte[] rawMember = rawValue(member); @@ -244,10 +244,10 @@ public GeoResults> doInRedis(RedisConnection connection) { /* * (non-Javadoc) - * @see org.springframework.data.redis.core.GeoOperations#georadiusByMember(java.lang.Object, java.lang.Object, org.springframework.data.geo.Distance) + * @see org.springframework.data.redis.core.GeoOperations#geoRadiusByMember(java.lang.Object, java.lang.Object, org.springframework.data.geo.Distance) */ @Override - public GeoResults> georadiusByMember(K key, M member, final Distance distance) { + public GeoResults> geoRadiusByMember(K key, M member, final Distance distance) { final byte[] rawKey = rawKey(key); final byte[] rawMember = rawValue(member); @@ -264,10 +264,10 @@ public GeoResults> doInRedis(RedisConnection connection) { /* * (non-Javadoc) - * @see org.springframework.data.redis.core.GeoOperations#georadiusByMember(java.lang.Object, java.lang.Object, double, org.springframework.data.geo.Metric, org.springframework.data.redis.core.GeoRadiusCommandArgs) + * @see org.springframework.data.redis.core.GeoOperations#geoRadiusByMember(java.lang.Object, java.lang.Object, double, org.springframework.data.geo.Metric, org.springframework.data.redis.core.GeoRadiusCommandArgs) */ @Override - public GeoResults> georadiusByMember(K key, M member, final Distance distance, + public GeoResults> geoRadiusByMember(K key, M member, final Distance distance, final GeoRadiusCommandArgs param) { final byte[] rawKey = rawKey(key); diff --git a/src/main/java/org/springframework/data/redis/core/GeoOperations.java b/src/main/java/org/springframework/data/redis/core/GeoOperations.java index fabb08e172..6af23a44e7 100644 --- a/src/main/java/org/springframework/data/redis/core/GeoOperations.java +++ b/src/main/java/org/springframework/data/redis/core/GeoOperations.java @@ -128,7 +128,7 @@ public interface GeoOperations { * @return never {@literal null}. * @see http://redis.io/commands/georadius */ - GeoResults> georadius(K key, Circle within); + GeoResults> geoRadius(K key, Circle within); /** * Get the {@literal member}s within the boundaries of a given {@link Circle} applying {@link GeoRadiusCommandArgs}. @@ -139,7 +139,7 @@ public interface GeoOperations { * @return never {@literal null}. * @see http://redis.io/commands/georadius */ - GeoResults> georadius(K key, Circle within, GeoRadiusCommandArgs args); + GeoResults> geoRadius(K key, Circle within, GeoRadiusCommandArgs args); /** * Get the {@literal member}s within the circle defined by the {@literal members} coordinates and given @@ -151,7 +151,7 @@ public interface GeoOperations { * @return never {@literal null}. * @see http://redis.io/commands/georadiusbymember */ - GeoResults> georadiusByMember(K key, M member, double radius); + GeoResults> geoRadiusByMember(K key, M member, double radius); /** * Get the {@literal member}s within the circle defined by the {@literal members} coordinates and given @@ -163,7 +163,7 @@ public interface GeoOperations { * @return never {@literal null}. * @see http://redis.io/commands/georadiusbymember */ - GeoResults> georadiusByMember(K key, M member, Distance distance); + GeoResults> geoRadiusByMember(K key, M member, Distance distance); /** * Get the {@literal member}s within the circle defined by the {@literal members} coordinates and given @@ -176,7 +176,7 @@ public interface GeoOperations { * @return never {@literal null}. * @see http://redis.io/commands/georadiusbymember */ - GeoResults> georadiusByMember(K key, M member, Distance distance, GeoRadiusCommandArgs args); + GeoResults> geoRadiusByMember(K key, M member, Distance distance, GeoRadiusCommandArgs args); /** * Remove the {@literal member}s. diff --git a/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java index 976416d79f..9eeb9759b5 100644 --- a/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java @@ -2660,8 +2660,8 @@ public void geoRadiusShouldReturnMembersCorrectly() { String key = "geo-" + UUID.randomUUID(); actual.add(connection.geoAdd(key, Arrays.asList(ARIGENTO, CATANIA, PALERMO))); - actual.add(connection.georadius(key, new Circle(new Point(15D, 37D), new Distance(200D, KILOMETERS)))); - actual.add(connection.georadius(key, new Circle(new Point(15D, 37D), new Distance(150D, KILOMETERS)))); + actual.add(connection.geoRadius(key, new Circle(new Point(15D, 37D), new Distance(200D, KILOMETERS)))); + actual.add(connection.geoRadius(key, new Circle(new Point(15D, 37D), new Distance(150D, KILOMETERS)))); List results = getResults(); assertThat(((GeoResults>) results.get(1)).getContent(), hasSize(3)); @@ -2679,7 +2679,7 @@ public void geoRadiusShouldReturnDistanceCorrectly() { String key = "geo-" + UUID.randomUUID(); actual.add(connection.geoAdd(key, Arrays.asList(ARIGENTO, CATANIA, PALERMO))); - actual.add(connection.georadius(key, new Circle(new Point(15D, 37D), new Distance(200D, KILOMETERS)), + actual.add(connection.geoRadius(key, new Circle(new Point(15D, 37D), new Distance(200D, KILOMETERS)), newGeoRadiusArgs().includeDistance())); List results = getResults(); @@ -2701,7 +2701,7 @@ public void geoRadiusShouldApplyLimit() { String key = "geo-" + UUID.randomUUID(); actual.add(connection.geoAdd(key, Arrays.asList(ARIGENTO, CATANIA, PALERMO))); - actual.add(connection.georadius(key, new Circle(new Point(15D, 37D), new Distance(200D, KILOMETERS)), + actual.add(connection.geoRadius(key, new Circle(new Point(15D, 37D), new Distance(200D, KILOMETERS)), newGeoRadiusArgs().limit(2))); List results = getResults(); @@ -2719,7 +2719,7 @@ public void geoRadiusByMemberShouldReturnMembersCorrectly() { String key = "geo-" + UUID.randomUUID(); actual.add(connection.geoAdd(key, Arrays.asList(ARIGENTO, CATANIA, PALERMO))); - actual.add(connection.georadiusByMember(key, PALERMO.getName(), new Distance(100, KILOMETERS), + actual.add(connection.geoRadiusByMember(key, PALERMO.getName(), new Distance(100, KILOMETERS), newGeoRadiusArgs().sortAscending())); List results = getResults(); @@ -2740,7 +2740,7 @@ public void geoRadiusByMemberShouldReturnDistanceCorrectly() { String key = "geo-" + UUID.randomUUID(); actual.add(connection.geoAdd(key, Arrays.asList(ARIGENTO, CATANIA, PALERMO))); - actual.add(connection.georadiusByMember(key, PALERMO.getName(), new Distance(100, KILOMETERS), + actual.add(connection.geoRadiusByMember(key, PALERMO.getName(), new Distance(100, KILOMETERS), newGeoRadiusArgs().includeDistance())); List results = getResults(); @@ -2762,7 +2762,7 @@ public void geoRadiusByMemberShouldApplyLimit() { String key = "geo-" + UUID.randomUUID(); actual.add(connection.geoAdd(key, Arrays.asList(ARIGENTO, CATANIA, PALERMO))); - actual.add(connection.georadiusByMember(key, PALERMO.getName(), new Distance(200, KILOMETERS), + actual.add(connection.geoRadiusByMember(key, PALERMO.getName(), new Distance(200, KILOMETERS), newGeoRadiusArgs().limit(2))); List results = getResults(); diff --git a/src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionTests.java b/src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionTests.java index c0b3ef508c..9d9dc8cf8d 100644 --- a/src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionTests.java +++ b/src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionTests.java @@ -1977,7 +1977,7 @@ public void testGeoRadiusWithoutParam() { doReturn(geoResults).when(nativeConnection).geoRadius(eq(fooBytes), any(Circle.class)); actual.add( - connection.georadius(foo, new Circle(new Point(13.361389, 38.115556), new Distance(10, DistanceUnit.FEET)))); + connection.geoRadius(foo, new Circle(new Point(13.361389, 38.115556), new Distance(10, DistanceUnit.FEET)))); verifyResults(Arrays.asList(Converters.deserializingGeoResultsConverter(serializer).convert(geoResults))); } @@ -2004,7 +2004,7 @@ public void testGeoRadiusWithDist() { GeoRadiusCommandArgs geoRadiusParam = GeoRadiusCommandArgs.newGeoRadiusArgs().includeDistance(); doReturn(geoResults).when(nativeConnection).geoRadius(eq(fooBytes), any(Circle.class), eq(geoRadiusParam)); - actual.add(connection.georadius(foo, + actual.add(connection.geoRadius(foo, new Circle(new Point(13.361389, 38.115556), new Distance(10, DistanceUnit.FEET)), geoRadiusParam)); verifyResults(Arrays.asList(Converters.deserializingGeoResultsConverter(serializer).convert(geoResults))); } @@ -2031,7 +2031,7 @@ public void testGeoRadiusWithCoordAndDesc() { GeoRadiusCommandArgs geoRadiusParam = GeoRadiusCommandArgs.newGeoRadiusArgs().includeCoordinates().sortDescending(); doReturn(geoResults).when(nativeConnection).geoRadius(eq(fooBytes), any(Circle.class), eq(geoRadiusParam)); - actual.add(connection.georadius(foo, + actual.add(connection.geoRadius(foo, new Circle(new Point(13.361389, 38.115556), new Distance(10, DistanceUnit.FEET)), geoRadiusParam)); verifyResults(Arrays.asList(Converters.deserializingGeoResultsConverter(serializer).convert(geoResults))); } @@ -2058,7 +2058,7 @@ public void testGeoRadiusByMemberWithoutParam() { doReturn(geoResults).when(nativeConnection).geoRadiusByMember(fooBytes, barBytes, new Distance(38.115556, DistanceUnit.FEET)); - actual.add(connection.georadiusByMember(foo, bar, new Distance(38.115556, DistanceUnit.FEET))); + actual.add(connection.geoRadiusByMember(foo, bar, new Distance(38.115556, DistanceUnit.FEET))); verifyResults(Arrays.asList(Converters.deserializingGeoResultsConverter(serializer).convert(geoResults))); } @@ -2087,7 +2087,7 @@ public void testGeoRadiusByMemberWithDistAndAsc() { doReturn(geoResults).when(nativeConnection).geoRadiusByMember(fooBytes, barBytes, new Distance(38.115556, DistanceUnit.FEET), geoRadiusParam); - actual.add(connection.georadiusByMember(foo, bar, new Distance(38.115556, DistanceUnit.FEET), geoRadiusParam)); + actual.add(connection.geoRadiusByMember(foo, bar, new Distance(38.115556, DistanceUnit.FEET), geoRadiusParam)); verifyResults(Arrays.asList(Converters.deserializingGeoResultsConverter(serializer).convert(geoResults))); } @@ -2116,7 +2116,7 @@ public void testGeoRadiusByMemberWithCoordAndCount() { doReturn(geoResults).when(nativeConnection).geoRadiusByMember(fooBytes, barBytes, new Distance(38.115556, DistanceUnit.FEET), geoRadiusParam); - actual.add(connection.georadiusByMember(foo, bar, new Distance(38.115556, DistanceUnit.FEET), geoRadiusParam)); + actual.add(connection.geoRadiusByMember(foo, bar, new Distance(38.115556, DistanceUnit.FEET), geoRadiusParam)); verifyResults(Arrays.asList(Converters.deserializingGeoResultsConverter(serializer).convert(geoResults))); } diff --git a/src/test/java/org/springframework/data/redis/core/DefaultGeoOperationsTests.java b/src/test/java/org/springframework/data/redis/core/DefaultGeoOperationsTests.java index 9740c99bb2..b8d3265089 100644 --- a/src/test/java/org/springframework/data/redis/core/DefaultGeoOperationsTests.java +++ b/src/test/java/org/springframework/data/redis/core/DefaultGeoOperationsTests.java @@ -272,7 +272,7 @@ public void geoRadiusShouldReturnMembersCorrectly() { geoOperations.geoAdd(key, POINT_PALERMO, member1); geoOperations.geoAdd(key, POINT_CATANIA, member2); - GeoResults> result = geoOperations.georadius(key, + GeoResults> result = geoOperations.geoRadius(key, new Circle(new Point(15D, 37D), new Distance(200D, KILOMETERS))); assertThat(result.getContent(), hasSize(2)); @@ -291,7 +291,7 @@ public void geoRadiusShouldReturnLocationsWithDistance() { geoOperations.geoAdd(key, POINT_PALERMO, member1); geoOperations.geoAdd(key, POINT_CATANIA, member2); - GeoResults> result = geoOperations.georadius(key, + GeoResults> result = geoOperations.geoRadius(key, new Circle(new Point(15, 37), new Distance(200, KILOMETERS)), newGeoRadiusArgs().includeDistance().sortDescending()); @@ -318,7 +318,7 @@ public void geoRadiusShouldReturnLocationsWithCoordinates() { geoOperations.geoAdd(key, POINT_PALERMO, member1); geoOperations.geoAdd(key, POINT_CATANIA, member2); - GeoResults> result = geoOperations.georadius(key, + GeoResults> result = geoOperations.geoRadius(key, new Circle(new Point(15, 37), new Distance(200, KILOMETERS)), newGeoRadiusArgs().includeCoordinates().sortAscending()); @@ -345,7 +345,7 @@ public void geoRadiusShouldReturnLocationsWithCoordinatesAndDistance() { geoOperations.geoAdd(key, POINT_PALERMO, member1); geoOperations.geoAdd(key, POINT_CATANIA, member2); - GeoResults> result = geoOperations.georadius(key, + GeoResults> result = geoOperations.geoRadius(key, new Circle(new Point(15, 37), new Distance(200, KILOMETERS)), newGeoRadiusArgs().includeCoordinates().includeDistance().sortAscending()); assertThat(result.getContent(), hasSize(2)); @@ -378,7 +378,7 @@ public void geoRadiusByMemberShouldReturnMembersCorrectly() { geoOperations.geoAdd(key, POINT_CATANIA, member2); geoOperations.geoAdd(key, POINT_ARIGENTO, member3); - GeoResults> result = geoOperations.georadiusByMember(key, member3, new Distance(200, KILOMETERS)); + GeoResults> result = geoOperations.geoRadiusByMember(key, member3, new Distance(200, KILOMETERS)); assertThat(result.getContent(), hasSize(3)); } @@ -397,7 +397,7 @@ public void geoRadiusByMemberShouldReturnDistanceCorrectly() { geoOperations.geoAdd(key, POINT_CATANIA, member2); geoOperations.geoAdd(key, POINT_ARIGENTO, member3); - GeoResults> result = geoOperations.georadiusByMember(key, member3, new Distance(100, KILOMETERS), + GeoResults> result = geoOperations.geoRadiusByMember(key, member3, new Distance(100, KILOMETERS), newGeoRadiusArgs().includeDistance().sortDescending()); assertThat(result.getContent(), hasSize(2)); @@ -422,7 +422,7 @@ public void geoRadiusByMemberShouldReturnCoordinates() { geoOperations.geoAdd(key, POINT_CATANIA, member2); geoOperations.geoAdd(key, POINT_ARIGENTO, member3); - GeoResults> result = geoOperations.georadiusByMember(key, member3, + GeoResults> result = geoOperations.geoRadiusByMember(key, member3, new Distance(100, DistanceUnit.KILOMETERS), newGeoRadiusArgs().includeCoordinates().sortAscending()); assertThat(result.getContent(), hasSize(2)); @@ -451,7 +451,7 @@ public void geoRadiusByMemberShouldReturnCoordinatesAndDistance() { geoOperations.geoAdd(key, POINT_ARIGENTO, member3); // with coord and dist, ascending - GeoResults> result = geoOperations.georadiusByMember(key, member1, new Distance(100, KILOMETERS), + GeoResults> result = geoOperations.geoRadiusByMember(key, member1, new Distance(100, KILOMETERS), newGeoRadiusArgs().includeCoordinates().includeDistance().sortAscending()); assertThat(result.getContent(), hasSize(2));