Polishing.

Remove duplicate conversion code.

Original Pull Request: #2292

Author: mp911de

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

@@ -25,7 +25,6 @@
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.core.convert.converter.Converter;
-import org.springframework.data.domain.Range;
 import org.springframework.data.geo.Circle;
 import org.springframework.data.geo.Distance;
 import org.springframework.data.geo.GeoResults;
@@ -49,6 +48,7 @@
 import org.springframework.data.redis.connection.stream.StreamOffset;
 import org.springframework.data.redis.connection.stream.StreamReadOptions;
 import org.springframework.data.redis.connection.stream.StringRecord;
+import org.springframework.data.redis.connection.zset.Aggregate;
 import org.springframework.data.redis.connection.zset.DefaultTuple;
 import org.springframework.data.redis.connection.zset.Tuple;
 import org.springframework.data.redis.connection.zset.Weights;

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

@@ -23,7 +23,6 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import org.springframework.data.domain.Range;
 import org.springframework.data.geo.Circle;
 import org.springframework.data.geo.Distance;
 import org.springframework.data.geo.GeoResults;
@@ -41,6 +40,7 @@
 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.zset.Aggregate;
 import org.springframework.data.redis.connection.zset.Tuple;
 import org.springframework.data.redis.connection.zset.Weights;
 import org.springframework.data.redis.core.Cursor;

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

@@ -33,7 +33,7 @@
 import org.reactivestreams.Publisher;
 import org.springframework.data.domain.Range;
 import org.springframework.data.domain.Sort.Direction;
-import org.springframework.data.redis.connection.RedisZSetCommands.Aggregate;
+import org.springframework.data.redis.connection.zset.Aggregate;
 import org.springframework.data.redis.connection.zset.DefaultTuple;
 import org.springframework.data.redis.connection.zset.Tuple;
 import org.springframework.data.redis.connection.zset.Weights;

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

@@ -20,6 +20,7 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
+import org.springframework.data.redis.connection.zset.Aggregate;
 import org.springframework.data.redis.connection.zset.Tuple;
 import org.springframework.data.redis.connection.zset.Weights;
 import org.springframework.data.redis.core.Cursor;
@@ -41,14 +42,8 @@
 public interface RedisZSetCommands {
 
 	/**
-	 * Sort aggregation operations.
-	 */
-	enum Aggregate {
-		SUM, MIN, MAX;
-	}
-
-	/**
-	 * {@link Range} defines {@literal min} and {@literal max} values to retrieve from a {@literal ZSET}.
+	 * {@link org.springframework.data.domain.Range} defines {@literal min} and {@literal max} values to retrieve from a
+	 * {@literal ZSET}.
 	 *
 	 * @author Christoph Strobl
 	 * @since 1.6
@@ -61,14 +56,15 @@ class Range {
 		@Nullable Boundary max;
 
 		/**
-		 * @return new {@link Range}
+		 * @return new {@link org.springframework.data.domain.Range}
 		 */
 		public static Range range() {
 			return new Range();
 		}
 
 		/**
-		 * @return new {@link Range} with {@literal min} and {@literal max} set to {@link Boundary#infinite()}.
+		 * @return new {@link org.springframework.data.domain.Range} with {@literal min} and {@literal max} set to
+		 *         {@link Boundary#infinite()}.
 		 */
 		public static Range unbounded() {
 
@@ -963,7 +959,7 @@ default Long zCount(byte[] key, double min, double max) {
 	Long zRemRange(byte[] key, long start, long end);
 
 	/**
-	 * Remove all elements between the lexicographical {@link Range}.
+	 * Remove all elements between the lexicographical {@link org.springframework.data.domain.Range}.
 	 *
 	 * @param key must not be {@literal null}.
 	 * @param range must not be {@literal null}.
@@ -1299,7 +1295,8 @@ default Set<byte[]> zRangeByLex(byte[] key) {
 	}
 
 	/**
-	 * Get all the elements in {@link Range} from the sorted set at {@literal key} in lexicographical ordering.
+	 * Get all the elements in {@link org.springframework.data.domain.Range} from the sorted set at {@literal key} in
+	 * lexicographical ordering.
 	 *
 	 * @param key must not be {@literal null}.
 	 * @param range must not be {@literal null}.
@@ -1313,8 +1310,8 @@ default Set<byte[]> zRangeByLex(byte[] key, org.springframework.data.domain.Rang
 	}
 
 	/**
-	 * Get all the elements in {@link Range} from the sorted set at {@literal key} in lexicographical ordering. Result is
-	 * limited via {@link Limit}.
+	 * Get all the elements in {@link org.springframework.data.domain.Range} from the sorted set at {@literal key} in
+	 * lexicographical ordering. Result is limited via {@link Limit}.
 	 *
 	 * @param key must not be {@literal null}.
 	 * @param range must not be {@literal null}.
@@ -1341,7 +1338,8 @@ default Set<byte[]> zRevRangeByLex(byte[] key) {
 	}
 
 	/**
-	 * Get all the elements in {@link Range} from the sorted set at {@literal key} in reversed lexicographical ordering.
+	 * Get all the elements in {@link org.springframework.data.domain.Range} from the sorted set at {@literal key} in
+	 * reversed lexicographical ordering.
 	 *
 	 * @param key must not be {@literal null}.
 	 * @param range must not be {@literal null}.
@@ -1355,8 +1353,8 @@ default Set<byte[]> zRevRangeByLex(byte[] key, org.springframework.data.domain.R
 	}
 
 	/**
-	 * Get all the elements in {@link Range} from the sorted set at {@literal key} in reversed lexicographical ordering.
-	 * Result is limited via {@link Limit}.
+	 * Get all the elements in {@link org.springframework.data.domain.Range} from the sorted set at {@literal key} in
+	 * reversed lexicographical ordering. Result is limited via {@link Limit}.
 	 *
 	 * @param key must not be {@literal null}.
 	 * @param range must not be {@literal null}.

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

@@ -41,6 +41,7 @@
 import org.springframework.data.redis.connection.stream.StreamReadOptions;
 import org.springframework.data.redis.connection.stream.StreamRecords;
 import org.springframework.data.redis.connection.stream.StringRecord;
+import org.springframework.data.redis.connection.zset.Aggregate;
 import org.springframework.data.redis.connection.zset.Tuple;
 import org.springframework.data.redis.connection.zset.Weights;
 import org.springframework.data.redis.core.Cursor;

src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterZSetCommands.java

@@ -31,6 +31,7 @@
 import org.springframework.data.redis.connection.ClusterSlotHashUtil;
 import org.springframework.data.redis.connection.RedisZSetCommands;
 import org.springframework.data.redis.connection.convert.SetConverter;
+import org.springframework.data.redis.connection.zset.Aggregate;
 import org.springframework.data.redis.connection.zset.DefaultTuple;
 import org.springframework.data.redis.connection.zset.Tuple;
 import org.springframework.data.redis.connection.zset.Weights;

src/main/java/org/springframework/data/redis/connection/jedis/JedisZSetCommands.java

@@ -28,6 +28,7 @@
 
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.redis.connection.RedisZSetCommands;
+import org.springframework.data.redis.connection.zset.Aggregate;
 import org.springframework.data.redis.connection.zset.DefaultTuple;
 import org.springframework.data.redis.connection.zset.Tuple;
 import org.springframework.data.redis.connection.zset.Weights;

src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConverters.java

@@ -48,7 +48,6 @@
 import org.springframework.data.redis.connection.RedisListCommands.Position;
 import org.springframework.data.redis.connection.RedisNode.NodeType;
 import org.springframework.data.redis.connection.RedisStringCommands.SetOption;
-import org.springframework.data.redis.connection.RedisZSetCommands.Range.Boundary;
 import org.springframework.data.redis.connection.SortParameters.Order;
 import org.springframework.data.redis.connection.convert.Converters;
 import org.springframework.data.redis.connection.convert.StringToRedisClientInfoConverter;
@@ -257,19 +256,6 @@ public static List<RedisClientInfo> toListOfRedisClientInformation(String client
 		return StringToRedisClientInfoConverter.INSTANCE.convert(clientList.split("\\r?\\n"));
 	}
 
-	private static String boundaryToString(Boundary boundary, String inclPrefix, String exclPrefix) {
-
-		String prefix = boundary.isIncluding() ? inclPrefix : exclPrefix;
-		String value = null;
-		if (boundary.getValue() instanceof byte[]) {
-			value = toString((byte[]) boundary.getValue());
-		} else {
-			value = boundary.getValue().toString();
-		}
-
-		return prefix + value;
-	}
-
 	/**
 	 * Convert a {@link Limit} to a Lettuce {@link io.lettuce.core.Limit}.
 	 *
@@ -290,81 +276,44 @@ public static io.lettuce.core.Limit toLimit(Limit limit) {
 	 * @since 2.0
 	 */
 	public static <T> Range<T> toRange(org.springframework.data.domain.Range<T> range) {
-		return Range.from(lowerBoundaryOf(range, false), upperBoundaryOf(range, false));
+		return toRange(range, false);
 	}
 
 	/**
-	 * Convert a {@link org.springframework.data.redis.connection.RedisZSetCommands.Range} to a lettuce {@link Range}.
+	 * Convert a {@link org.springframework.data.domain.Range} to a lettuce {@link Range}.
 	 *
 	 * @param range
 	 * @param convertNumberToBytes
 	 * @return
 	 * @since 2.2
 	 */
-	public static <T> Range<T> toRange(org.springframework.data.domain.Range<T> range,
-			boolean convertNumberToBytes) {
-		return Range.from(lowerBoundaryOf(range, convertNumberToBytes), upperBoundaryOf(range, convertNumberToBytes));
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public static <T> Range<T> toRange(org.springframework.data.domain.Range<T> range, boolean convertNumberToBytes) {
+
+		Range.Boundary upper = RangeConverter.convertBound(range.getUpperBound(), convertNumberToBytes, null,
+				it -> it.getBytes(StandardCharsets.UTF_8));
+		Range.Boundary lower = RangeConverter.convertBound(range.getLowerBound(), convertNumberToBytes, null,
+				it -> it.getBytes(StandardCharsets.UTF_8));
+
+		return Range.from(lower, upper);
 	}
 
 	/**
-	 * Convert a {@link org.springframework.data.redis.connection.RedisZSetCommands.Range} to a lettuce {@link Range} and
-	 * reverse boundaries.
+	 * Convert a {@link org.springframework.data.domain.Range} to a lettuce {@link Range} and reverse boundaries.
 	 *
 	 * @param range
 	 * @return
 	 * @since 2.0
 	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
 	public static <T> Range<T> toRevRange(org.springframework.data.domain.Range<T> range) {
-		return Range.from(upperBoundaryOf(range, false), lowerBoundaryOf(range, false));
-	}
-
-	@SuppressWarnings("unchecked")
-	private static <T> Range.Boundary<T> lowerBoundaryOf(
-			org.springframework.data.domain.Range<T> range, boolean convertNumberToBytes) {
-		return (Range.Boundary<T>) rangeToBoundaryArgumentConverter(false, convertNumberToBytes).convert(range);
-	}
-
-	@SuppressWarnings("unchecked")
-	private static <T> Range.Boundary<T> upperBoundaryOf(
-			org.springframework.data.domain.Range<T> range, boolean convertNumberToBytes) {
-		return (Range.Boundary<T>) rangeToBoundaryArgumentConverter(true, convertNumberToBytes).convert(range);
-	}
 
-	private static Converter<org.springframework.data.domain.Range<?>, Range.Boundary<?>> rangeToBoundaryArgumentConverter(
-			boolean upper, boolean convertNumberToBytes) {
+		Range.Boundary upper = RangeConverter.convertBound(range.getUpperBound(), false, null,
+				it -> it.getBytes(StandardCharsets.UTF_8));
+		Range.Boundary lower = RangeConverter.convertBound(range.getLowerBound(), false, null,
+				it -> it.getBytes(StandardCharsets.UTF_8));
 
-		return (source) -> {
-
-			org.springframework.data.domain.Range.Bound<?> sourceBoundary = upper ? source.getUpperBound()
-					: source.getLowerBound();
-			if (sourceBoundary == null || !sourceBoundary.isBounded()) {
-				return Range.Boundary.unbounded();
-			}
-
-			boolean inclusive = sourceBoundary.isInclusive();
-			Object value = sourceBoundary.getValue().get();
-
-			if (value instanceof Number) {
-
-				if (convertNumberToBytes) {
-					value = value.toString();
-				} else {
-					return inclusive ? Range.Boundary.including((Number) value) : Range.Boundary.excluding((Number) value);
-				}
-			}
-
-			if (value instanceof String) {
-
-				if (!StringUtils.hasText((String) value) || ObjectUtils.nullSafeEquals(value, "+")
-						|| ObjectUtils.nullSafeEquals(value, "-")) {
-					return Range.Boundary.unbounded();
-				}
-				return inclusive ? Range.Boundary.including(value.toString().getBytes(StandardCharsets.UTF_8))
-						: Range.Boundary.excluding(value.toString().getBytes(StandardCharsets.UTF_8));
-			}
-
-			return inclusive ? Range.Boundary.including((byte[]) value) : Range.Boundary.excluding((byte[]) value);
-		};
+		return Range.from(upper, lower);
 	}
 
 	/**

src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveZSetCommands.java

@@ -37,7 +37,7 @@
 import org.springframework.data.redis.connection.ReactiveRedisConnection.MultiValueResponse;
 import org.springframework.data.redis.connection.ReactiveRedisConnection.NumericResponse;
 import org.springframework.data.redis.connection.ReactiveZSetCommands;
-import org.springframework.data.redis.connection.RedisZSetCommands.Aggregate;
+import org.springframework.data.redis.connection.zset.Aggregate;
 import org.springframework.data.redis.connection.zset.DefaultTuple;
 import org.springframework.data.redis.connection.zset.Tuple;
 import org.springframework.data.redis.core.TimeoutUtils;

src/main/java/org/springframework/data/redis/connection/lettuce/LettuceZSetCommands.java

@@ -31,6 +31,7 @@
 import org.springframework.data.redis.connection.RedisZSetCommands;
 import org.springframework.data.redis.connection.RedisZSetCommands.ZAddArgs.Flag;
 import org.springframework.data.redis.connection.convert.Converters;
+import org.springframework.data.redis.connection.zset.Aggregate;
 import org.springframework.data.redis.connection.zset.Tuple;
 import org.springframework.data.redis.connection.zset.Weights;
 import org.springframework.data.redis.core.Cursor;

src/main/java/org/springframework/data/redis/connection/lettuce/RangeConverter.java

@@ -19,8 +19,6 @@
 import io.lettuce.core.Range.Boundary;
 import io.lettuce.core.codec.StringCodec;
 
-import java.nio.ByteBuffer;
-import java.util.function.BiFunction;
 import java.util.function.Function;
 
 import org.springframework.data.domain.Range.Bound;
@@ -79,45 +77,50 @@ static <T> Range<T> toRangeWithDefault(org.springframework.data.domain.Range<?>
 	@SuppressWarnings("unchecked")
 	private static <T> Boundary<T> lowerBoundArgOf(org.springframework.data.domain.Range<?> range,
 			@Nullable T lowerDefault, Function<String, ? extends Object> stringEncoder) {
-		return (Boundary<T>) rangeToBoundArgumentConverter(false, stringEncoder).apply(range, lowerDefault);
+		return (Boundary<T>) convertBound(range.getLowerBound(), false, lowerDefault, stringEncoder);
 	}
 
 	@SuppressWarnings("unchecked")
 	private static <T> Boundary<T> upperBoundArgOf(org.springframework.data.domain.Range<?> range,
 			@Nullable T upperDefault, Function<String, ? extends Object> stringEncoder) {
-		return (Boundary<T>) rangeToBoundArgumentConverter(true, stringEncoder).apply(range, upperDefault);
+		return (Boundary<T>) convertBound(range.getUpperBound(), false, upperDefault, stringEncoder);
 	}
 
-	private static BiFunction<org.springframework.data.domain.Range, Object, Boundary<?>> rangeToBoundArgumentConverter(
-			boolean upper, Function<String, ? extends Object> stringEncoder) {
+	static Boundary<?> convertBound(org.springframework.data.domain.Range.Bound source, boolean convertNumberToBytes,
+			Object defaultValue, Function<String, ? extends Object> stringEncoder) {
 
-		return (source, defaultValue) -> {
+		if (!source.isBounded()) {
+			return Boundary.unbounded();
+		}
 
-			Boolean inclusive = upper ? source.getUpperBound().isInclusive() : source.getLowerBound().isInclusive();
-			Object value = upper ? source.getUpperBound().getValue().orElse(defaultValue)
-					: source.getLowerBound().getValue().orElse(defaultValue);
+		Boolean inclusive = source.isInclusive();
+		Object value = source.getValue().orElse(defaultValue);
 
-			if (value instanceof Number) {
+		if (value instanceof Number) {
+
+			if (convertNumberToBytes) {
+				value = value.toString();
+			} else {
 				return inclusive ? Boundary.including((Number) value) : Boundary.excluding((Number) value);
 			}
+		}
 
-			if (value instanceof String) {
+		if (value instanceof String) {
 
-				if (!StringUtils.hasText((String) value) || ObjectUtils.nullSafeEquals(value, "+")
-						|| ObjectUtils.nullSafeEquals(value, "-")) {
-					return Boundary.unbounded();
-				}
+			if (!StringUtils.hasText((String) value) || ObjectUtils.nullSafeEquals(value, "+")
+					|| ObjectUtils.nullSafeEquals(value, "-")) {
+				return Boundary.unbounded();
+			}
 
-				Object encoded = stringEncoder.apply((String) value);
-				return inclusive ? Boundary.including(encoded) : Boundary.excluding(encoded);
+			Object encoded = stringEncoder.apply((String) value);
+			return inclusive ? Boundary.including(encoded) : Boundary.excluding(encoded);
 
-			}
+		}
 
-			if (value == null) {
-				return Boundary.unbounded();
-			}
+		if (value == null) {
+			return Boundary.unbounded();
+		}
 
-			return inclusive ? Boundary.including((ByteBuffer) value) : Boundary.excluding((ByteBuffer) value);
-		};
+		return inclusive ? Boundary.including(value) : Boundary.excluding(value);
 	}
 }