DATAREDIS-533 - Polishing.

Remove empty lines after last inner class. Extract duplicate code in variable. Fix spelling. Update Reference Documentation. Remove merge leftovers. Original pull request: spring-projects#215.

Author: mp911de

src/main/asciidoc/new-features.adoc

@@ -7,6 +7,7 @@ New and noteworthy in the latest releases.
 == New in Spring Data Redis 1.8
 
 * Support for Redis http://redis.io/commands#geo[GEO] commands.
+* Support for Geospatial Indexes using Spring Data Repository abstractions (see <<redis.repositories.indexes.geospatial>>).
 
 [[new-in-1.7.0]]
 == New in Spring Data Redis 1.7

src/main/asciidoc/reference/redis-repositories.adoc

@@ -310,6 +310,7 @@ public class ApplicationConfig {
 == Secondary Indexes
 http://redis.io/topics/indexes[Secondary indexes] are used to enable lookup operations based on native Redis structures. Values are written to the according indexes on every save and are removed when objects are deleted or <<redis.repositories.expirations,expire>>.
 
+[[redis.repositories.indexes.simple]]
 === Simple Property Index
 
 Given the sample `Person` entity we can create an index for _firstname_ by annotating the property with `@Indexed`.
@@ -421,9 +422,10 @@ public class ApplicationConfig {
 ----
 ====
 
+[[redis.repositories.indexes.geospatial]]
 === Geospatial Index
 
-Assume the `Address` type contains a property `location` of type `Point` that holds the geo coordinates of the particular address. By annotating the property with `@GeoIndexed` those values will be added using  Redis `GEO` commands.
+Assume the `Address` type contains a property `location` of type `Point` that holds the geo coordinates of the particular address. By annotating the property with `@GeoIndexed` those values will be added using Redis `GEO` commands.
 
 ====
 [source,java]
@@ -456,13 +458,13 @@ repository.save(rand); <3
 
 repository.findByAddressLocationNear(new Point(15D, 37D), new Distance(200)); <4>
 ----
-<1> finder declaration on nested property using Point and Distance.
-<2> finder declaration on nested property using Circle to search within.
+<1> Query method declaration on nested property using Point and Distance.
+<2> Query method declaration on nested property using Circle to search within.
 <3> `GEOADD persons:address:location 13.361389 38.115556 e2c7dcee-b8cd-4424-883e-736ce564363e`
 <4> `GEORADIUS persons:address:location 15.0 37.0 200.0 km`
 ====
 
-In the above example the lon/lat values are stored using `GEOADD` using the objects `id` as the members name. The finder methods allow usage of `Circle` or `Point, Distance` combinations for querying those values.
+In the above example the lon/lat values are stored using `GEOADD` using the objects `id` as the member's name. The finder methods allow usage of `Circle` or `Point, Distance` combinations for querying those values.
 
 NOTE: It is **not** possible to combine `near`/`within` with other criteria.
 

src/main/java/org/springframework/data/redis/core/IndexWriter.java

@@ -206,7 +206,7 @@ protected void addKeyToIndex(byte[] key, IndexedData indexedData) {
 return;
 }
 
-else if (indexedData instanceof SimpleIndexedPropertyValue) {
+if (indexedData instanceof SimpleIndexedPropertyValue) {
 
 Object value = ((SimpleIndexedPropertyValue) indexedData).getValue();
 
@@ -234,9 +234,7 @@ else if (indexedData instanceof SimpleIndexedPropertyValue) {
 
 // keep track of indexes used for the object
 connection.sAdd(ByteUtils.concatAll(toBytes(indexedData.getKeyspace() + ":"), key, toBytes(":idx")), indexKey);
-}
-
-else {
+} else {
 throw new IllegalArgumentException(
 String.format("Cannot write index data for unknown index type %s", indexedData.getClass()));
 }

src/main/java/org/springframework/data/redis/core/RedisKeyValueAdapter.java

@@ -516,9 +516,9 @@ private RedisUpdateObject fetchDeletePathsFromHashAndUpdateIndex(RedisUpdateObje
 ? ByteUtils.concatAll(toBytes(redisUpdateObject.keyspace), toBytes((":" + path)), toBytes(":"), value) : null;
 
 if (connection.exists(existingValueIndexKey)) {
-
 redisUpdateObject.addIndexToUpdate(new RedisUpdateObject.Index(existingValueIndexKey, DataType.SET));
 }
+
 return redisUpdateObject;
 }
 
@@ -545,13 +545,11 @@ private RedisUpdateObject fetchDeletePathsFromHashAndUpdateIndex(RedisUpdateObje
 }
 
 String pathToUse = GeoIndexedPropertyValue.geoIndexName(path);
-if (connection.zRank(ByteUtils.concatAll(toBytes(redisUpdateObject.keyspace), toBytes(":"), toBytes(pathToUse)),
-toBytes(redisUpdateObject.targetId)) != null) {
+byte[] existingGeoIndexKey = ByteUtils.concatAll(toBytes(redisUpdateObject.keyspace), toBytes(":"),
+toBytes(pathToUse));
 
-redisUpdateObject
-.addIndexToUpdate(new org.springframework.data.redis.core.RedisKeyValueAdapter.RedisUpdateObject.Index(
-ByteUtils.concatAll(toBytes(redisUpdateObject.keyspace), toBytes(":"), toBytes(pathToUse)),
-DataType.ZSET));
+if (connection.zRank(existingGeoIndexKey, toBytes(redisUpdateObject.targetId)) != null) {
+redisUpdateObject.addIndexToUpdate(new RedisUpdateObject.Index(existingGeoIndexKey, DataType.ZSET));
 }
 
 return redisUpdateObject;

src/main/java/org/springframework/data/redis/core/RedisQueryEngine.java

@@ -90,18 +90,11 @@ public <T> Collection<T> execute(final RedisOperationChain criteria, final Compa
 @Override
 public Map<byte[], Map<byte[], byte[]>> doInRedis(RedisConnection connection) throws DataAccessException {
 
-String key = keyspace + ":";
-byte[][] keys = new byte[criteria.getSismember().size()][];
-int i = 0;
-for (Object o : criteria.getSismember()) {
-keys[i] = getAdapter().getConverter().getConversionService().convert(key + o, byte[].class);
-i++;
-}
-
 List<byte[]> allKeys = new ArrayList<byte[]>();
 if (!criteria.getSismember().isEmpty()) {
 allKeys.addAll(connection.sInter(keys(keyspace + ":", criteria.getSismember())));
 }
+
 if (!criteria.getOrSismember().isEmpty()) {
 allKeys.addAll(connection.sUnion(keys(keyspace + ":", criteria.getOrSismember())));
 }
@@ -229,5 +222,4 @@ public RedisOperationChain resolve(KeyValueQuery<?> query) {
 return (RedisOperationChain) query.getCritieria();
 }
 }
-
 }

src/main/java/org/springframework/data/redis/core/convert/IndexedDataFactoryProvider.java

@@ -81,5 +81,4 @@ public GeoIndexedPropertyValue createIndexedDataFor(Object value) {
 (Point) indexDefinition.valueTransformer().convert(value));
 }
 }
-
 }

src/main/java/org/springframework/data/redis/repository/query/RedisOperationChain.java

@@ -27,7 +27,7 @@
 import org.springframework.util.ObjectUtils;
 
 /**
- * Simple set of operations requried to run queries against Redis.
+ * Simple set of operations required to run queries against Redis.
  * 
  * @author Christoph Strobl
  * @since 1.7
@@ -36,7 +36,6 @@ public class RedisOperationChain {
 
 private Set<PathAndValue> sismember = new LinkedHashSet<PathAndValue>();
 private Set<PathAndValue> orSismember = new LinkedHashSet<PathAndValue>();
-
 private NearPath near;
 
 public void sismember(String path, Object value) {
@@ -163,5 +162,4 @@ public Distance getDistance() {
 return (Distance) it.next();
 }
 }
-
 }

src/main/java/org/springframework/data/redis/repository/query/RedisQueryCreator.java

@@ -41,7 +41,6 @@ public class RedisQueryCreator extends AbstractQueryCreator<KeyValueQuery<RedisO
 
 public RedisQueryCreator(PartTree tree, ParameterAccessor parameters) {
 super(tree, parameters);
-
 }
 
 /*
@@ -68,7 +67,6 @@ private RedisOperationChain from(Part part, Iterator<Object> iterator, RedisOper
 }
 
 return sink;
-
 }
 
 /*
@@ -150,5 +148,4 @@ private NearPath getNearPath(Part part, Iterator<Object> iterator) {
 
 return new NearPath(part.getProperty().toDotPath(), point, distance);
 }
-
 }

src/test/java/org/springframework/data/redis/core/convert/PathIndexResolverUnitTests.java

@@ -637,5 +637,4 @@ static class GeoIndexedOnPoint {
 static class GeoIndexedOnArray {
 @GeoIndexed double[] location;
 }
-
 }

src/test/java/org/springframework/data/redis/repository/RedisRepositoryIntegrationTestBase.java

@@ -584,5 +584,4 @@ public boolean equals(Object obj) {
 return true;
 }
 }
-
 }