From 0b123d2c27360a3cea84d12feab0d2a0d62007d0 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 14 Aug 2023 11:28:51 +0200 Subject: [PATCH] Polishing. Consistent operations documentation wording. --- .../redis/core/DefaultReactiveGeoOperations.java | 2 +- .../data/redis/core/ReactiveGeoOperations.java | 2 +- .../data/redis/core/ReactiveHashOperations.java | 2 +- .../core/ReactiveHyperLogLogOperations.java | 2 +- .../data/redis/core/ReactiveListOperations.java | 2 +- .../data/redis/core/ReactiveSetOperations.java | 2 +- .../redis/core/ReactiveStreamOperations.java | 16 ++-------------- .../data/redis/core/ReactiveZSetOperations.java | 2 +- 8 files changed, 9 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/springframework/data/redis/core/DefaultReactiveGeoOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultReactiveGeoOperations.java index ea509dc02f..6df8747542 100644 --- a/src/main/java/org/springframework/data/redis/core/DefaultReactiveGeoOperations.java +++ b/src/main/java/org/springframework/data/redis/core/DefaultReactiveGeoOperations.java @@ -328,7 +328,7 @@ private V readValue(ByteBuffer buffer) { private GeoResult> readGeoResult(GeoResult> source) { - return new GeoResult<>(new GeoLocation(readValue(source.getContent().getName()), source.getContent().getPoint()), + return new GeoResult<>(new GeoLocation<>(readValue(source.getContent().getName()), source.getContent().getPoint()), source.getDistance()); } } diff --git a/src/main/java/org/springframework/data/redis/core/ReactiveGeoOperations.java b/src/main/java/org/springframework/data/redis/core/ReactiveGeoOperations.java index 9bf70d8c44..99974cac70 100644 --- a/src/main/java/org/springframework/data/redis/core/ReactiveGeoOperations.java +++ b/src/main/java/org/springframework/data/redis/core/ReactiveGeoOperations.java @@ -35,7 +35,7 @@ import org.springframework.data.redis.domain.geo.GeoShape; /** - * Reactive Redis operations for geo commands. + * Reactive Redis operations for Geo Commands. * * @author Mark Paluch * @author Christoph Strobl diff --git a/src/main/java/org/springframework/data/redis/core/ReactiveHashOperations.java b/src/main/java/org/springframework/data/redis/core/ReactiveHashOperations.java index a24e8670f8..9516bdc508 100644 --- a/src/main/java/org/springframework/data/redis/core/ReactiveHashOperations.java +++ b/src/main/java/org/springframework/data/redis/core/ReactiveHashOperations.java @@ -24,7 +24,7 @@ import java.util.Map; /** - * Redis map specific operations working on a hash. + * Reactive Redis operations for Hash Commands. *

* Streams of methods returning {@code Mono} or {@code Flux} are terminated with * {@link org.springframework.dao.InvalidDataAccessApiUsageException} when diff --git a/src/main/java/org/springframework/data/redis/core/ReactiveHyperLogLogOperations.java b/src/main/java/org/springframework/data/redis/core/ReactiveHyperLogLogOperations.java index 8dbe30ed92..d19da8fd66 100644 --- a/src/main/java/org/springframework/data/redis/core/ReactiveHyperLogLogOperations.java +++ b/src/main/java/org/springframework/data/redis/core/ReactiveHyperLogLogOperations.java @@ -18,7 +18,7 @@ import reactor.core.publisher.Mono; /** - * Redis cardinality specific operations working on a HyperLogLog multiset. + * Reactive Redis operations for working on a HyperLogLog multiset. * * @author Mark Paluch * @since 2.0 diff --git a/src/main/java/org/springframework/data/redis/core/ReactiveListOperations.java b/src/main/java/org/springframework/data/redis/core/ReactiveListOperations.java index 774318ff4f..edf0360ff2 100644 --- a/src/main/java/org/springframework/data/redis/core/ReactiveListOperations.java +++ b/src/main/java/org/springframework/data/redis/core/ReactiveListOperations.java @@ -29,7 +29,7 @@ import org.springframework.util.Assert; /** - * Redis list specific operations. + * Reactive Redis operations for List Commands. *

* Streams of methods returning {@code Mono} or {@code Flux} are terminated with * {@link org.springframework.dao.InvalidDataAccessApiUsageException} when diff --git a/src/main/java/org/springframework/data/redis/core/ReactiveSetOperations.java b/src/main/java/org/springframework/data/redis/core/ReactiveSetOperations.java index a36adfdc37..f8d0feff61 100644 --- a/src/main/java/org/springframework/data/redis/core/ReactiveSetOperations.java +++ b/src/main/java/org/springframework/data/redis/core/ReactiveSetOperations.java @@ -23,7 +23,7 @@ import java.util.Map; /** - * Redis set specific operations. + * Reactive Redis operations for Set Commands. *

* Streams of methods returning {@code Mono} or {@code Flux} are terminated with * {@link org.springframework.dao.InvalidDataAccessApiUsageException} when diff --git a/src/main/java/org/springframework/data/redis/core/ReactiveStreamOperations.java b/src/main/java/org/springframework/data/redis/core/ReactiveStreamOperations.java index 1002a660b5..9314bc2383 100644 --- a/src/main/java/org/springframework/data/redis/core/ReactiveStreamOperations.java +++ b/src/main/java/org/springframework/data/redis/core/ReactiveStreamOperations.java @@ -23,32 +23,20 @@ import java.util.Map; import org.reactivestreams.Publisher; - import org.springframework.data.domain.Range; import org.springframework.data.redis.connection.Limit; import org.springframework.data.redis.connection.RedisStreamCommands.XClaimOptions; -import org.springframework.data.redis.connection.stream.ByteBufferRecord; -import org.springframework.data.redis.connection.stream.Consumer; -import org.springframework.data.redis.connection.stream.MapRecord; -import org.springframework.data.redis.connection.stream.ObjectRecord; -import org.springframework.data.redis.connection.stream.PendingMessage; -import org.springframework.data.redis.connection.stream.PendingMessages; -import org.springframework.data.redis.connection.stream.PendingMessagesSummary; -import org.springframework.data.redis.connection.stream.ReadOffset; +import org.springframework.data.redis.connection.stream.*; import org.springframework.data.redis.connection.stream.Record; -import org.springframework.data.redis.connection.stream.RecordId; import org.springframework.data.redis.connection.stream.StreamInfo.XInfoConsumer; import org.springframework.data.redis.connection.stream.StreamInfo.XInfoGroup; import org.springframework.data.redis.connection.stream.StreamInfo.XInfoStream; -import org.springframework.data.redis.connection.stream.StreamOffset; -import org.springframework.data.redis.connection.stream.StreamReadOptions; -import org.springframework.data.redis.connection.stream.StreamRecords; import org.springframework.data.redis.hash.HashMapper; import org.springframework.lang.Nullable; import org.springframework.util.Assert; /** - * Redis stream specific operations. + * Reactive Redis operations for Stream Commands. * * @author Mark Paluch * @author Christoph Strobl diff --git a/src/main/java/org/springframework/data/redis/core/ReactiveZSetOperations.java b/src/main/java/org/springframework/data/redis/core/ReactiveZSetOperations.java index 2bc4caed78..1416b92c7e 100644 --- a/src/main/java/org/springframework/data/redis/core/ReactiveZSetOperations.java +++ b/src/main/java/org/springframework/data/redis/core/ReactiveZSetOperations.java @@ -33,7 +33,7 @@ import org.springframework.lang.Nullable; /** - * Redis ZSet/sorted set specific operations. + * Reactive Redis operations for Sorted (ZSet) Commands. *

* Streams of methods returning {@code Mono} or {@code Flux} are terminated with * {@link org.springframework.dao.InvalidDataAccessApiUsageException} when