refactor: Replaced custom toString() methods with Lombok

redis · Jan 25, 2025 · fd2304e · fd2304e
1 parent 2baaf17
commit fd2304e
Show file tree

Hide file tree

Showing 22 changed files with 399 additions and 497 deletions.
diff --git a/build.gradle b/build.gradle
@@ -96,6 +96,9 @@ subprojects {
     }
 
     dependencies {
+        compileOnly 'org.projectlombok:lombok'
+        annotationProcessor 'org.projectlombok:lombok'
+
         testImplementation 'org.junit.jupiter:junit-jupiter-api'
         testImplementation 'org.junit.jupiter:junit-jupiter-params'
         testImplementation 'org.junit.jupiter:junit-jupiter-engine'

diff --git a/core/lettucemod/src/main/java/com/redis/lettucemod/RedisURIBuilder.java b/core/lettucemod/src/main/java/com/redis/lettucemod/RedisURIBuilder.java
@@ -1,12 +1,13 @@
 package com.redis.lettucemod;
 
 import java.time.Duration;
-import java.util.Arrays;
 
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.SslVerifyMode;
 import io.lettuce.core.internal.LettuceAssert;
+import lombok.ToString;
 
+@ToString
 public class RedisURIBuilder {
 
 	public static final String DEFAULT_HOST = "127.0.0.1";
@@ -49,8 +50,12 @@ public RedisURI build() {
 			builder.withTimeout(timeout);
 		}
 		RedisURI redisURI = builder.build();
-		redisURI.setLibraryName(libraryName);
-		redisURI.setLibraryVersion(libraryVersion);
+		if (RedisModulesUtils.hasLength(libraryName) && !RedisModulesUtils.hasLength(redisURI.getLibraryName())) {
+			redisURI.setLibraryName(libraryName);
+		}
+		if (RedisModulesUtils.hasLength(libraryVersion) && !RedisModulesUtils.hasLength(redisURI.getLibraryVersion())) {
+			redisURI.setLibraryVersion(libraryVersion);
+		}
 		if (RedisModulesUtils.hasLength(clientName) && !RedisModulesUtils.hasLength(redisURI.getClientName())) {
 			redisURI.setClientName(clientName);
 		}
@@ -117,6 +122,16 @@ public RedisURIBuilder clientName(String clientName) {
 		return this;
 	}
 
+	public RedisURIBuilder libraryName(String libraryName) {
+		this.libraryName = libraryName;
+		return this;
+	}
+
+	public RedisURIBuilder libraryVersion(String libraryVersion) {
+		this.libraryVersion = libraryVersion;
+		return this;
+	}
+
 	public RedisURIBuilder tls(boolean tls) {
 		this.tls = tls;
 		return this;
@@ -127,12 +142,4 @@ public RedisURIBuilder verifyMode(SslVerifyMode verifyMode) {
 		return this;
 	}
 
-	@Override
-	public String toString() {
-		return "RedisURIBuilder [uri=" + uri + ", host=" + host + ", port=" + port + ", socket=" + socket
-				+ ", username=" + username + ", password=" + Arrays.toString(password) + ", timeout=" + timeout
-				+ ", database=" + database + ", clientName=" + clientName + ", tls=" + tls + ", verifyMode="
-				+ verifyMode + "]";
-	}
-
 }
diff --git a/core/lettucemod/src/main/java/com/redis/lettucemod/search/AggregateOptions.java b/core/lettucemod/src/main/java/com/redis/lettucemod/search/AggregateOptions.java
@@ -8,6 +8,9 @@
 
 import com.redis.lettucemod.protocol.SearchCommandKeyword;
 
+import lombok.ToString;
+
+@ToString
 public class AggregateOptions<K, V> extends BaseSearchOptions<K, V> {
 
 	private static final Load LOAD_ALL = Load.identifier("*").build();
@@ -54,13 +57,6 @@ public void build(SearchCommandArgs<K, V> args) {
 		operations.forEach(op -> op.build(args));
 	}
 
-	@Override
-	public String toString() {
-		return "AggregateOptions [operations=" + operations + ", loads=" + loads + ", getTimeout()=" + getTimeout()
-				+ ", isVerbatim()=" + isVerbatim() + ", getLimit()=" + getLimit() + ", getParams()=" + getParams()
-				+ ", getDialect()=" + getDialect() + "]";
-	}
-
 	@SuppressWarnings("rawtypes")
 	public static class Load implements RediSearchArgument {
 

diff --git a/core/lettucemod/src/main/java/com/redis/lettucemod/search/Apply.java b/core/lettucemod/src/main/java/com/redis/lettucemod/search/Apply.java
@@ -2,6 +2,9 @@
 
 import com.redis.lettucemod.protocol.SearchCommandKeyword;
 
+import lombok.ToString;
+
+@ToString
 public class Apply<K, V> implements AggregateOperation<K, V> {
 
 	private final V expression;
@@ -32,11 +35,6 @@ public void build(SearchCommandArgs<K, V> args) {
 		args.add(SearchCommandKeyword.AS).addKey(as);
 	}
 
-	@Override
-	public String toString() {
-		return "APPLY " + expression + " " + as;
-	}
-
 	public static <K, V> Builder<K, V> expression(V expression) {
 		return new Builder<>(expression);
 	}

diff --git a/core/lettucemod/src/main/java/com/redis/lettucemod/search/CreateOptions.java b/core/lettucemod/src/main/java/com/redis/lettucemod/search/CreateOptions.java
@@ -10,6 +10,9 @@
 
 import com.redis.lettucemod.protocol.SearchCommandKeyword;
 
+import lombok.ToString;
+
+@ToString
 public class CreateOptions<K, V> implements RediSearchArgument<K, V> {
 
 	public enum DataType {
@@ -222,15 +225,6 @@ public void build(SearchCommandArgs<K, V> args) {
 		});
 	}
 
-	@Override
-	public String toString() {
-		return "CreateOptions [on=" + on + ", prefixes=" + prefixes + ", filter=" + filter + ", defaultLanguage="
-				+ defaultLanguage + ", languageField=" + languageField + ", defaultScore=" + defaultScore
-				+ ", scoreField=" + scoreField + ", payloadField=" + payloadField + ", maxTextFields=" + maxTextFields
-				+ ", temporary=" + temporary + ", noOffsets=" + noOffsets + ", noHL=" + noHL + ", noFields=" + noFields
-				+ ", noFreqs=" + noFreqs + ", skipInitialScan=" + skipInitialScan + ", stopWords=" + stopWords + "]";
-	}
-
 	public static <K, V> Builder<K, V> builder() {
 		return new Builder<>();
 	}
@@ -299,7 +293,7 @@ public Builder<K, V> payloadField(K payloadField) {
 			this.payloadField = Optional.of(payloadField);
 			return this;
 		}
-		
+
 		public Builder<K, V> maxTextFields() {
 			return maxTextFields(true);
 		}
@@ -313,7 +307,7 @@ public Builder<K, V> temporary(long temporary) {
 			this.temporary = OptionalLong.of(temporary);
 			return this;
 		}
-		
+
 		public Builder<K, V> noOffsets() {
 			return noOffsets(true);
 		}
@@ -322,7 +316,7 @@ public Builder<K, V> noOffsets(boolean noOffsets) {
 			this.noOffsets = noOffsets;
 			return this;
 		}
-		
+
 		public Builder<K, V> noHL() {
 			return noHL(true);
 		}
@@ -331,7 +325,7 @@ public Builder<K, V> noHL(boolean noHL) {
 			this.noHL = noHL;
 			return this;
 		}
-		
+
 		public Builder<K, V> noFields() {
 			return noFields(true);
 		}
@@ -340,7 +334,7 @@ public Builder<K, V> noFields(boolean noFields) {
 			this.noFields = noFields;
 			return this;
 		}
-		
+
 		public Builder<K, V> noFreqs() {
 			return noFreqs(true);
 		}
@@ -349,7 +343,7 @@ public Builder<K, V> noFreqs(boolean noFreqs) {
 			this.noFreqs = noFreqs;
 			return this;
 		}
-		
+
 		public Builder<K, V> skipInitialScan() {
 			return skipInitialScan(true);
 		}

diff --git a/core/lettucemod/src/main/java/com/redis/lettucemod/search/CursorOptions.java b/core/lettucemod/src/main/java/com/redis/lettucemod/search/CursorOptions.java
@@ -7,6 +7,9 @@
 
 import com.redis.lettucemod.protocol.SearchCommandKeyword;
 
+import lombok.ToString;
+
+@ToString
 public class CursorOptions {
 
 	private OptionalLong count = OptionalLong.empty();
@@ -52,11 +55,6 @@ public int hashCode() {
 		return Objects.hash(count, maxIdle);
 	}
 
-	@Override
-	public String toString() {
-		return "CursorOptions [count=" + count + ", maxIdle=" + maxIdle + "]";
-	}
-
 	@Override
 	public boolean equals(Object obj) {
 		if (this == obj)

diff --git a/core/lettucemod/src/main/java/com/redis/lettucemod/search/Filter.java b/core/lettucemod/src/main/java/com/redis/lettucemod/search/Filter.java
@@ -2,7 +2,10 @@
 
 import com.redis.lettucemod.protocol.SearchCommandKeyword;
 
+import lombok.ToString;
+
 @SuppressWarnings("rawtypes")
+@ToString
 public class Filter<V> implements AggregateOperation {
 
 	private final V expression;
@@ -20,11 +23,6 @@ public V getExpression() {
 		return expression;
 	}
 
-	@Override
-	public String toString() {
-		return "FILTER " + expression;
-	}
-
 	public static <V> Filter<V> expression(V expression) {
 		return new Filter<>(expression);
 	}

diff --git a/core/lettucemod/src/main/java/com/redis/lettucemod/search/GeoField.java b/core/lettucemod/src/main/java/com/redis/lettucemod/search/GeoField.java
@@ -2,6 +2,9 @@
 
 import com.redis.lettucemod.protocol.SearchCommandKeyword;
 
+import lombok.ToString;
+
+@ToString
 public class GeoField<K> extends Field<K> {
 
 	private GeoField(Builder<K> builder) {
@@ -13,12 +16,6 @@ protected void buildField(SearchCommandArgs<K, Object> args) {
 		args.add(SearchCommandKeyword.GEO);
 	}
 
-	@Override
-	public String toString() {
-		return "GeoField [type=" + type + ", name=" + name + ", as=" + as + ", sortable=" + sortable
-				+ ", unNormalizedForm=" + unNormalizedForm + ", noIndex=" + noIndex + "]";
-	}
-
 	public static <K> Builder<K> name(K name) {
 		return new Builder<>(name);
 	}

diff --git a/core/lettucemod/src/main/java/com/redis/lettucemod/search/Group.java b/core/lettucemod/src/main/java/com/redis/lettucemod/search/Group.java
@@ -1,7 +1,6 @@
 package com.redis.lettucemod.search;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -20,8 +19,10 @@
 import com.redis.lettucemod.search.Reducers.ToList;
 
 import io.lettuce.core.internal.LettuceAssert;
+import lombok.ToString;
 
 @SuppressWarnings("rawtypes")
+@ToString
 public class Group implements AggregateOperation {
 
 	private final String[] properties;
@@ -61,11 +62,6 @@ public void build(SearchCommandArgs args) {
 		}
 	}
 
-	@Override
-	public String toString() {
-		return "GROUP [properties=" + Arrays.toString(properties) + ", reducers=" + Arrays.toString(reducers) + "]";
-	}
-
 	public static Builder by(String... properties) {
 		return new Builder(properties);
 	}