Spring/spring-data-redis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAREDIS-514 - Unify geoRadius capitalization.

Browse Source 
Unify capitalization of geoRadius to match other geo prefixed operations.

Original pull request: #200.
This commit is contained in:
Christoph Strobl
2016-05-25 14:15:39 +02:00
committed by Mark Paluch
parent d88d992f6d
commit 2b51966768
14 changed files with 105 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/org/springframework/data/redis/connection/DefaultStringRedisConnection.java
View File

@@ -2499,10 +2499,10 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
/*
* (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<GeoLocation<String>> georadius(String key, Circle within) {
public GeoResults<GeoLocation<String>> geoRadius(String key, Circle within) {
GeoResults<GeoLocation<byte[]>> result = delegate.geoRadius(serialize(key), within);
if (isFutureConversion()) {
@@ -2514,10 +2514,10 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
/*
* (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<GeoLocation<String>> georadius(String key, Circle within, GeoRadiusCommandArgs args) {
public GeoResults<GeoLocation<String>> geoRadius(String key, Circle within, GeoRadiusCommandArgs args) {
GeoResults<GeoLocation<byte[]>> result = delegate.geoRadius(serialize(key), within, args);
if (isFutureConversion()) {
@@ -2528,19 +2528,19 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
/*
* (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<GeoLocation<String>> georadiusByMember(String key, String member, double radius) {
return georadiusByMember(key, member, new Distance(radius, DistanceUnit.METERS));
public GeoResults<GeoLocation<String>> 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<GeoLocation<String>> georadiusByMember(String key, String member, Distance radius) {
public GeoResults<GeoLocation<String>> geoRadiusByMember(String key, String member, Distance radius) {
GeoResults<GeoLocation<byte[]>> result = delegate.geoRadiusByMember(serialize(key), serialize(member), radius);
if (isFutureConversion()) {
@@ -2551,10 +2551,10 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
/*
* (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<GeoLocation<String>> georadiusByMember(String key, String member, Distance radius,
public GeoResults<GeoLocation<String>> geoRadiusByMember(String key, String member, Distance radius,
GeoRadiusCommandArgs args) {
GeoResults<GeoLocation<byte[]>> result = delegate.geoRadiusByMember(serialize(key), serialize(member), radius,
@@ -2567,7 +2567,7 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
/*
* (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<GeoLocation<byte[]>> geoRadius(byte[] key, Circle within) {
@@ -2581,7 +2581,7 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
/*
* (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<GeoLocation<byte[]>> geoRadius(byte[] key, Circle within, GeoRadiusCommandArgs args) {
@@ -2595,7 +2595,7 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
/*
* (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<GeoLocation<byte[]>> geoRadiusByMember(byte[] key, byte[] member, double radius) {
@@ -2604,7 +2604,7 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
/*
* (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<GeoLocation<byte[]>> geoRadiusByMember(byte[] key, byte[] member, Distance radius) {
@@ -2618,7 +2618,7 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
/*
* (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<GeoLocation<byte[]>> geoRadiusByMember(byte[] key, byte[] member, Distance radius,

10
src/main/java/org/springframework/data/redis/connection/StringRedisConnection.java
View File

@@ -732,7 +732,7 @@ public interface StringRedisConnection extends RedisConnection {
* @see <a href="http://redis.io/commands/georadius">http://redis.io/commands/georadius</a>
* @since 1.8
*/
GeoResults<GeoLocation<String>> georadius(String key, Circle within);
GeoResults<GeoLocation<String>> 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 StringRedisConnection extends RedisConnection {
* @see <a href="http://redis.io/commands/georadius">http://redis.io/commands/georadius</a>
* @since 1.8
*/
GeoResults<GeoLocation<String>> georadius(String key, Circle within, GeoRadiusCommandArgs args);
GeoResults<GeoLocation<String>> 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 StringRedisConnection extends RedisConnection {
* @see <a href="http://redis.io/commands/georadiusbymember">http://redis.io/commands/georadiusbymember</a>
* @since 1.8
*/
GeoResults<GeoLocation<String>> georadiusByMember(String key, String member, double radius);
GeoResults<GeoLocation<String>> 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 StringRedisConnection extends RedisConnection {
* @see <a href="http://redis.io/commands/georadiusbymember">http://redis.io/commands/georadiusbymember</a>
* @since 1.8
*/
GeoResults<GeoLocation<String>> georadiusByMember(String key, String member, Distance radius);
GeoResults<GeoLocation<String>> 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 StringRedisConnection extends RedisConnection {
* @see <a href="http://redis.io/commands/georadiusbymember">http://redis.io/commands/georadiusbymember</a>
* @since 1.8
*/
GeoResults<GeoLocation<String>> georadiusByMember(String key, String member, Distance radius,
GeoResults<GeoLocation<String>> geoRadiusByMember(String key, String member, Distance radius,
GeoRadiusCommandArgs args);
/**

10
src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterConnection.java
View File

@@ -2675,7 +2675,7 @@ public class JedisClusterConnection implements RedisClusterConnection {
/*
* (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<GeoLocation<byte[]>> geoRadius(byte[] key, Circle within) {
@@ -2694,7 +2694,7 @@ public class JedisClusterConnection implements RedisClusterConnection {
/*
* (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<GeoLocation<byte[]>> geoRadius(byte[] key, Circle within, GeoRadiusCommandArgs args) {
@@ -2717,7 +2717,7 @@ public class JedisClusterConnection implements RedisClusterConnection {
/*
* (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<GeoLocation<byte[]>> geoRadiusByMember(byte[] key, byte[] member, double radius) {
@@ -2726,7 +2726,7 @@ public class JedisClusterConnection implements RedisClusterConnection {
/*
* (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<GeoLocation<byte[]>> geoRadiusByMember(byte[] key, byte[] member, Distance radius) {
@@ -2746,7 +2746,7 @@ public class JedisClusterConnection implements RedisClusterConnection {
/*
* (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<GeoLocation<byte[]>> geoRadiusByMember(byte[] key, byte[] member, Distance radius,

12
src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java
View File

@@ -3321,7 +3321,7 @@ public class JedisConnection extends AbstractRedisConnection {
/*
* (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<GeoLocation<byte[]>> geoRadius(byte[] key, Circle within) {
@@ -3358,7 +3358,7 @@ public class JedisConnection extends AbstractRedisConnection {
/*
* (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<GeoLocation<byte[]>> geoRadius(byte[] key, Circle within, GeoRadiusCommandArgs args) {
@@ -3394,7 +3394,7 @@ public class JedisConnection extends AbstractRedisConnection {
/*
* (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<GeoLocation<byte[]>> geoRadiusByMember(byte[] key, byte[] member, double radius) {
@@ -3403,7 +3403,7 @@ public class JedisConnection extends AbstractRedisConnection {
/*
* (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<GeoLocation<byte[]>> geoRadiusByMember(byte[] key, byte[] member, Distance radius) {
@@ -3432,6 +3432,10 @@ public class JedisConnection extends AbstractRedisConnection {
}
}
/*
* (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<GeoLocation<byte[]>> geoRadiusByMember(byte[] key, byte[] member, Distance radius,
GeoRadiusCommandArgs args) {

10
src/main/java/org/springframework/data/redis/connection/jredis/JredisConnection.java
View File

@@ -1275,7 +1275,7 @@ public class JredisConnection extends AbstractRedisConnection {
/*
* (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<GeoLocation<byte[]>> geoRadius(byte[] key, Circle within) {
@@ -1284,7 +1284,7 @@ public class JredisConnection extends AbstractRedisConnection {
/*
* (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<GeoLocation<byte[]>> geoRadius(byte[] key, Circle within, GeoRadiusCommandArgs args) {
@@ -1293,7 +1293,7 @@ public class JredisConnection extends AbstractRedisConnection {
/*
* (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<GeoLocation<byte[]>> geoRadiusByMember(byte[] key, byte[] member, double radius) {
@@ -1302,7 +1302,7 @@ public class JredisConnection extends AbstractRedisConnection {
/*
* (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<GeoLocation<byte[]>> geoRadiusByMember(byte[] key, byte[] member, Distance radius) {
@@ -1311,7 +1311,7 @@ public class JredisConnection extends AbstractRedisConnection {
/*
* (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<GeoLocation<byte[]>> geoRadiusByMember(byte[] key, byte[] member, Distance radius,

10
src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java
View File

@@ -3301,7 +3301,7 @@ public class LettuceConnection extends AbstractRedisConnection {
/*
* (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<GeoLocation<byte[]>> geoRadius(byte[] key, Circle within) {
@@ -3337,7 +3337,7 @@ public class LettuceConnection extends AbstractRedisConnection {
/*
* (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<GeoLocation<byte[]>> geoRadius(byte[] key, Circle within, GeoRadiusCommandArgs args) {
@@ -3373,7 +3373,7 @@ public class LettuceConnection extends AbstractRedisConnection {
/*
* (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<GeoLocation<byte[]>> geoRadiusByMember(byte[] key, byte[] member, double radius) {
@@ -3382,7 +3382,7 @@ public class LettuceConnection extends AbstractRedisConnection {
/*
* (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<GeoLocation<byte[]>> geoRadiusByMember(byte[] key, byte[] member, Distance radius) {
@@ -3414,7 +3414,7 @@ public class LettuceConnection extends AbstractRedisConnection {
/*
* (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<GeoLocation<byte[]>> geoRadiusByMember(byte[] key, byte[] member, Distance radius,

10
src/main/java/org/springframework/data/redis/connection/srp/SrpConnection.java
View File

@@ -2321,7 +2321,7 @@ public class SrpConnection extends AbstractRedisConnection {
/*
* (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<GeoLocation<byte[]>> geoRadius(byte[] key, Circle within) {
@@ -2330,7 +2330,7 @@ public class SrpConnection extends AbstractRedisConnection {
/*
* (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<GeoLocation<byte[]>> geoRadius(byte[] key, Circle within, GeoRadiusCommandArgs args) {
@@ -2339,7 +2339,7 @@ public class SrpConnection extends AbstractRedisConnection {
/*
* (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<GeoLocation<byte[]>> geoRadiusByMember(byte[] key, byte[] member, double radius) {
@@ -2348,7 +2348,7 @@ public class SrpConnection extends AbstractRedisConnection {
/*
* (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<GeoLocation<byte[]>> geoRadiusByMember(byte[] key, byte[] member, Distance radius) {
@@ -2357,7 +2357,7 @@ public class SrpConnection extends AbstractRedisConnection {
/*
* (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<GeoLocation<byte[]>> geoRadiusByMember(byte[] key, byte[] member, Distance radius,

10
src/main/java/org/springframework/data/redis/core/BoundGeoOperations.java
View File

@@ -118,7 +118,7 @@ public interface BoundGeoOperations<K, M> extends BoundKeyOperations<K> {
* @return never {@literal null}.
* @see <a href="http://redis.io/commands/georadius">http://redis.io/commands/georadius</a>
*/
GeoResults<GeoLocation<M>> georadius(Circle within);
GeoResults<GeoLocation<M>> 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<K, M> extends BoundKeyOperations<K> {
* @return never {@literal null}.
* @see <a href="http://redis.io/commands/georadius">http://redis.io/commands/georadius</a>
*/
GeoResults<GeoLocation<M>> georadius(Circle within, GeoRadiusCommandArgs args);
GeoResults<GeoLocation<M>> 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<K, M> extends BoundKeyOperations<K> {
* @return never {@literal null}.
* @see <a href="http://redis.io/commands/georadiusbymember">http://redis.io/commands/georadiusbymember</a>
*/
GeoResults<GeoLocation<M>> georadiusByMember(K key, M member, double radius);
GeoResults<GeoLocation<M>> 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<K, M> extends BoundKeyOperations<K> {
* @return never {@literal null}.
* @see <a href="http://redis.io/commands/georadiusbymember">http://redis.io/commands/georadiusbymember</a>
*/
GeoResults<GeoLocation<M>> georadiusByMember(M member, Distance distance);
GeoResults<GeoLocation<M>> 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<K, M> extends BoundKeyOperations<K> {
* @return never {@literal null}.
* @see <a href="http://redis.io/commands/georadiusbymember">http://redis.io/commands/georadiusbymember</a>
*/
GeoResults<GeoLocation<M>> georadiusByMember(M member, Distance distance, GeoRadiusCommandArgs args);
GeoResults<GeoLocation<M>> geoRadiusByMember(M member, Distance distance, GeoRadiusCommandArgs args);
/**
* Remove the {@literal member}s.

30
src/main/java/org/springframework/data/redis/core/DefaultBoundGeoOperations.java
View File

@@ -124,47 +124,47 @@ class DefaultBoundGeoOperations<K, M> extends DefaultBoundKeyOperations<K> imple
/*
* (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<GeoLocation<M>> georadius(Circle within) {
return ops.georadius(getKey(), within);
public GeoResults<GeoLocation<M>> 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<GeoLocation<M>> georadius(Circle within, GeoRadiusCommandArgs param) {
return ops.georadius(getKey(), within, param);
public GeoResults<GeoLocation<M>> 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<GeoLocation<M>> georadiusByMember(K key, M member, double radius) {
return ops.georadiusByMember(getKey(), member, radius);
public GeoResults<GeoLocation<M>> 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<GeoLocation<M>> georadiusByMember(M member, Distance distance) {
return ops.georadiusByMember(getKey(), member, distance);
public GeoResults<GeoLocation<M>> 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<GeoLocation<M>> georadiusByMember(M member, Distance distance, GeoRadiusCommandArgs param) {
return ops.georadiusByMember(getKey(), member, distance, param);
public GeoResults<GeoLocation<M>> geoRadiusByMember(M member, Distance distance, GeoRadiusCommandArgs param) {
return ops.geoRadiusByMember(getKey(), member, distance, param);
}
/*

20
src/main/java/org/springframework/data/redis/core/DefaultGeoOperations.java
View File

@@ -187,10 +187,10 @@ public class DefaultGeoOperations<K, M> extends AbstractOperations<K, M> impleme
/*
* (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<GeoLocation<M>> georadius(K key, final Circle within) {
public GeoResults<GeoLocation<M>> geoRadius(K key, final Circle within) {
final byte[] rawKey = rawKey(key);
@@ -206,10 +206,10 @@ public class DefaultGeoOperations<K, M> extends AbstractOperations<K, M> impleme
/*
* (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<GeoLocation<M>> georadius(K key, final Circle within, final GeoRadiusCommandArgs args) {
public GeoResults<GeoLocation<M>> geoRadius(K key, final Circle within, final GeoRadiusCommandArgs args) {
final byte[] rawKey = rawKey(key);
@@ -225,10 +225,10 @@ public class DefaultGeoOperations<K, M> extends AbstractOperations<K, M> impleme
/*
* (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<GeoLocation<M>> georadiusByMember(K key, M member, final double radius) {
public GeoResults<GeoLocation<M>> geoRadiusByMember(K key, M member, final double radius) {
final byte[] rawKey = rawKey(key);
final byte[] rawMember = rawValue(member);
@@ -244,10 +244,10 @@ public class DefaultGeoOperations<K, M> extends AbstractOperations<K, M> impleme
/*
* (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<GeoLocation<M>> georadiusByMember(K key, M member, final Distance distance) {
public GeoResults<GeoLocation<M>> geoRadiusByMember(K key, M member, final Distance distance) {
final byte[] rawKey = rawKey(key);
final byte[] rawMember = rawValue(member);
@@ -264,10 +264,10 @@ public class DefaultGeoOperations<K, M> extends AbstractOperations<K, M> impleme
/*
* (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<GeoLocation<M>> georadiusByMember(K key, M member, final Distance distance,
public GeoResults<GeoLocation<M>> geoRadiusByMember(K key, M member, final Distance distance,
final GeoRadiusCommandArgs param) {
final byte[] rawKey = rawKey(key);

10
src/main/java/org/springframework/data/redis/core/GeoOperations.java
View File

@@ -128,7 +128,7 @@ public interface GeoOperations<K, M> {
* @return never {@literal null}.
* @see <a href="http://redis.io/commands/georadius">http://redis.io/commands/georadius</a>
*/
GeoResults<GeoLocation<M>> georadius(K key, Circle within);
GeoResults<GeoLocation<M>> 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<K, M> {
* @return never {@literal null}.
* @see <a href="http://redis.io/commands/georadius">http://redis.io/commands/georadius</a>
*/
GeoResults<GeoLocation<M>> georadius(K key, Circle within, GeoRadiusCommandArgs args);
GeoResults<GeoLocation<M>> 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<K, M> {
* @return never {@literal null}.
* @see <a href="http://redis.io/commands/georadiusbymember">http://redis.io/commands/georadiusbymember</a>
*/
GeoResults<GeoLocation<M>> georadiusByMember(K key, M member, double radius);
GeoResults<GeoLocation<M>> 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<K, M> {
* @return never {@literal null}.
* @see <a href="http://redis.io/commands/georadiusbymember">http://redis.io/commands/georadiusbymember</a>
*/
GeoResults<GeoLocation<M>> georadiusByMember(K key, M member, Distance distance);
GeoResults<GeoLocation<M>> 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<K, M> {
* @return never {@literal null}.
* @see <a href="http://redis.io/commands/georadiusbymember">http://redis.io/commands/georadiusbymember</a>
*/
GeoResults<GeoLocation<M>> georadiusByMember(K key, M member, Distance distance, GeoRadiusCommandArgs args);
GeoResults<GeoLocation<M>> geoRadiusByMember(K key, M member, Distance distance, GeoRadiusCommandArgs args);
/**
* Remove the {@literal member}s.