Inline converters in Lettuce StreamConverters

Signed-off-by: Chris Bono <chris.bono@broadcom.com>

Author: onobc

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

@@ -27,18 +27,17 @@
 
 import java.time.Duration;
 import java.util.List;
-
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.redis.connection.RedisStreamCommands;
 import org.springframework.data.redis.connection.RedisStreamCommands.MaxLenTrimStrategy;
 import org.springframework.data.redis.connection.RedisStreamCommands.MinIdTrimStrategy;
 import org.springframework.data.redis.connection.RedisStreamCommands.TrimOperator;
 import org.springframework.data.redis.connection.RedisStreamCommands.TrimOptions;
 import org.springframework.data.redis.connection.RedisStreamCommands.TrimStrategy;
-import org.springframework.data.redis.connection.RedisStreamCommands.XClaimOptions;
 import org.springframework.data.redis.connection.RedisStreamCommands.XAddOptions;
-import org.springframework.data.redis.connection.RedisStreamCommands.XTrimOptions;
+import org.springframework.data.redis.connection.RedisStreamCommands.XClaimOptions;
 import org.springframework.data.redis.connection.RedisStreamCommands.XDelOptions;
+import org.springframework.data.redis.connection.RedisStreamCommands.XTrimOptions;
 import org.springframework.data.redis.connection.stream.ByteRecord;
 import org.springframework.data.redis.connection.stream.Consumer;
 import org.springframework.data.redis.connection.stream.PendingMessagesSummary;
@@ -82,15 +81,66 @@ static XClaimArgs toXClaimArgs(XClaimOptions options) {
 	}
 
 	static XAddArgs toXAddArgs(RecordId recordId, XAddOptions options) {
-		XAddArgs args = XAddOptionsToXAddArgsConverter.INSTANCE.convert(options);
+
+		XAddArgs args = new XAddArgs();
+
+		if (options.isNoMkStream()) {
+			args.nomkstream();
+		}
+
+		if (options.hasTrimOptions()) {
+			TrimOptions trimOptions = options.getTrimOptions();
+			TrimStrategy trimStrategy = trimOptions.getTrimStrategy();
+			if (trimStrategy instanceof MaxLenTrimStrategy maxLenTrimStrategy) {
+				args.maxlen(maxLenTrimStrategy.threshold());
+			} else if (trimStrategy instanceof MinIdTrimStrategy minIdTrimStrategy) {
+				args.minId(minIdTrimStrategy.threshold().getValue());
+			}
+
+			if (trimOptions.hasLimit()) {
+				args.limit(trimOptions.getLimit());
+			}
+
+			args.exactTrimming(trimOptions.getTrimOperator() == TrimOperator.EXACT);
+			args.approximateTrimming(trimOptions.getTrimOperator() == TrimOperator.APPROXIMATE);
+
+			if (trimOptions.hasDeletionPolicy()) {
+				args.trimmingMode(toStreamDeletionPolicy(trimOptions.getPendingReferences()));
+			}
+		}
+
 		if (!recordId.shouldBeAutoGenerated()) {
 			args.id(recordId.getValue());
 		}
+
 		return args;
 	}
 
 	static XTrimArgs toXTrimArgs(XTrimOptions options) {
-		return XTrimOptionsToXTrimArgsConverter.INSTANCE.convert(options);
+
+		XTrimArgs args = new XTrimArgs();
+
+		TrimOptions trimOptions = options.getTrimOptions();
+		TrimStrategy trimStrategy = trimOptions.getTrimStrategy();
+		if (trimStrategy instanceof MaxLenTrimStrategy maxLenTrimStrategy) {
+			args.maxlen(maxLenTrimStrategy.threshold());
+		}
+		else if (trimStrategy instanceof MinIdTrimStrategy minIdTrimStrategy) {
+			args.minId(minIdTrimStrategy.threshold().getValue());
+		}
+
+		if (trimOptions.hasLimit()) {
+			args.limit(trimOptions.getLimit());
+		}
+
+		args.exactTrimming(trimOptions.getTrimOperator() == TrimOperator.EXACT);
+		args.approximateTrimming(trimOptions.getTrimOperator() == TrimOperator.APPROXIMATE);
+
+		if (trimOptions.hasDeletionPolicy()) {
+			args.trimmingMode(toStreamDeletionPolicy(trimOptions.getPendingReferences()));
+		}
+
+		return args;
 	}
 
 	static StreamDeletionPolicy toXDelArgs(XDelOptions options) {
@@ -200,84 +250,6 @@ public XClaimArgs convert(XClaimOptions source) {
 		}
 	}
 
-	/**
-	 * {@link Converter} to convert {@link XAddOptions} to Lettuce's {@link XAddArgs}.
-	 *
-	 * @since 4.1
-	 */
-	enum XAddOptionsToXAddArgsConverter implements Converter<XAddOptions, XAddArgs> {
-
-		INSTANCE;
-
-		@Override
-		public XAddArgs convert(XAddOptions source) {
-
-			XAddArgs args = new XAddArgs();
-
-			if (source.isNoMkStream()) {
-				args.nomkstream();
-			}
-
-			if (!source.hasTrimOptions()) {
-				return args;
-			}
-
-			TrimOptions trimOptions = source.getTrimOptions();
-			TrimStrategy trimStrategy = trimOptions.getTrimStrategy();
-			if (trimStrategy instanceof MaxLenTrimStrategy maxLenTrimStrategy) {
-				args.maxlen(maxLenTrimStrategy.threshold());
-			}
-			else if (trimStrategy instanceof MinIdTrimStrategy minIdTrimStrategy) {
-				args.minId(minIdTrimStrategy.threshold().getValue());
-			}
-
-			if (trimOptions.hasLimit()) {
-				args.limit(trimOptions.getLimit());
-			}
-
-			args.exactTrimming(trimOptions.getTrimOperator() == TrimOperator.EXACT);
-			args.approximateTrimming(trimOptions.getTrimOperator() == TrimOperator.APPROXIMATE);
-
-			if (trimOptions.hasDeletionPolicy()) {
-				args.trimmingMode(toStreamDeletionPolicy(trimOptions.getPendingReferences()));
-			}
-
-			return args;
-		}
-	}
-
-	enum XTrimOptionsToXTrimArgsConverter implements Converter<XTrimOptions, XTrimArgs> {
-		INSTANCE;
-
-		@Override
-		public XTrimArgs convert(XTrimOptions source) {
-
-			XTrimArgs args = new XTrimArgs();
-
-			TrimOptions trimOptions = source.getTrimOptions();
-			TrimStrategy trimStrategy = trimOptions.getTrimStrategy();
-			if (trimStrategy instanceof MaxLenTrimStrategy maxLenTrimStrategy) {
-				args.maxlen(maxLenTrimStrategy.threshold());
-			}
-			else if (trimStrategy instanceof MinIdTrimStrategy minIdTrimStrategy) {
-				args.minId(minIdTrimStrategy.threshold().getValue());
-			}
-
-			if (trimOptions.hasLimit()) {
-				args.limit(trimOptions.getLimit());
-			}
-
-			args.exactTrimming(trimOptions.getTrimOperator() == TrimOperator.EXACT);
-			args.approximateTrimming(trimOptions.getTrimOperator() == TrimOperator.APPROXIMATE);
-
-			if (trimOptions.hasDeletionPolicy()) {
-				args.trimmingMode(toStreamDeletionPolicy(trimOptions.getPendingReferences()));
-			}
-
-			return args;
-		}
-	}
-
 	public static StreamDeletionPolicy toStreamDeletionPolicy(RedisStreamCommands.StreamDeletionPolicy deletionPolicy) {
 
 		return switch (deletionPolicy) {