Polishing #1

src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java

@@ -48,7 +48,7 @@
 import io.lettuce.core.protocol.CommandType;
 import io.lettuce.core.protocol.ProtocolKeyword;
 import io.lettuce.core.protocol.RedisCommand;
-import io.lettuce.core.search.Fields;
+import io.lettuce.core.search.Field;
 import io.lettuce.core.search.arguments.CreateArgs;
 import reactor.core.publisher.Mono;
 
@@ -1485,7 +1485,7 @@ public boolean isOpen() {
     }
 
     @Override
-    public RedisFuture<String> ftCreate(K index, CreateArgs<K, V> options, Fields<K> fields) {
+    public RedisFuture<String> ftCreate(K index, CreateArgs<K, V> options, List<Field<K>> fields) {
         return dispatch(searchCommandBuilder.ftCreate(index, options, fields));
     }
 

src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java

@@ -49,7 +49,7 @@
 import io.lettuce.core.protocol.RedisCommand;
 import io.lettuce.core.protocol.TracedCommand;
 import io.lettuce.core.resource.ClientResources;
-import io.lettuce.core.search.Fields;
+import io.lettuce.core.search.Field;
 import io.lettuce.core.search.arguments.CreateArgs;
 import io.lettuce.core.tracing.TraceContext;
 import io.lettuce.core.tracing.TraceContextProvider;
@@ -1549,7 +1549,7 @@ public boolean isOpen() {
     }
 
     @Override
-    public Mono<String> ftCreate(K index, CreateArgs<K, V> options, Fields<K> fields) {
+    public Mono<String> ftCreate(K index, CreateArgs<K, V> options, List<Field<K>> fields) {
         return createMono(() -> searchCommandBuilder.ftCreate(index, options, fields));
     }
 

src/main/java/io/lettuce/core/RediSearchCommandBuilder.java

@@ -12,10 +12,11 @@
 import io.lettuce.core.protocol.Command;
 import io.lettuce.core.protocol.CommandArgs;
 import io.lettuce.core.protocol.CommandKeyword;
-import io.lettuce.core.search.Fields;
 import io.lettuce.core.search.arguments.CreateArgs;
 import io.lettuce.core.search.Field;
 
+import java.util.List;
+
 import static io.lettuce.core.protocol.CommandType.*;
 
 /**
@@ -39,9 +40,9 @@ class RediSearchCommandBuilder<K, V> extends BaseRedisCommandBuilder<K, V> {
      * @param fields the fields
      * @return the result of the create command
      */
-    public Command<K, V, String> ftCreate(K index, CreateArgs<K, V> createArgs, Fields<K> fields) {
+    public Command<K, V, String> ftCreate(K index, CreateArgs<K, V> createArgs, List<Field<K>> fields) {
         notNullKey(index);
-        notEmpty(fields.getFields().toArray());
+        notEmpty(fields.toArray());
 
         CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(index);
 
@@ -51,7 +52,7 @@ public Command<K, V, String> ftCreate(K index, CreateArgs<K, V> createArgs, Fiel
 
         args.add(CommandKeyword.SCHEMA);
 
-        for (Field<K> field : fields.getFields()) {
+        for (Field<K> field : fields) {
             field.build(args);
         }
 

src/main/java/io/lettuce/core/api/async/RediSearchAsyncCommands.java

@@ -6,8 +6,9 @@
  */
 package io.lettuce.core.api.async;
 
+import java.util.List;
 import io.lettuce.core.RedisFuture;
-import io.lettuce.core.search.Fields;
+import io.lettuce.core.search.Field;
 import io.lettuce.core.search.arguments.CreateArgs;
 
 /**
@@ -23,13 +24,15 @@
 public interface RediSearchAsyncCommands<K, V> {
 
     /**
-     * Create a new index with the given name, index options and fields.
+     * Create a new index with the given name, index options, and fields.
      *
-     * @param index the index name
-     * @param options the index options
-     * @param fields the fields
+     * @param index the index name, as a key
+     * @param options the index {@link CreateArgs}
+     * @param fields the {@link Field}s of the index
      * @return the result of the create command
+     * @since 6.6
+     * @see <a href="https://redis.io/docs/latest/commands/ft.create/">FT.CREATE</a>
      */
-    RedisFuture<String> ftCreate(K index, CreateArgs<K, V> options, Fields<K> fields);
+    RedisFuture<String> ftCreate(K index, CreateArgs<K, V> options, List<Field<K>> fields);
 
 }

src/main/java/io/lettuce/core/api/reactive/RediSearchReactiveCommands.java

@@ -6,8 +6,8 @@
  */
 package io.lettuce.core.api.reactive;
 
+import java.util.List;
 import io.lettuce.core.search.Field;
-import io.lettuce.core.search.Fields;
 import io.lettuce.core.search.arguments.CreateArgs;
 import reactor.core.publisher.Mono;
 
@@ -24,13 +24,15 @@
 public interface RediSearchReactiveCommands<K, V> {
 
     /**
-     * Create a new index with the given name, index options and fields.
+     * Create a new index with the given name, index options, and fields.
      *
-     * @param index the index name
-     * @param options the index options
-     * @param fields the fields
+     * @param index the index name, as a key
+     * @param options the index {@link CreateArgs}
+     * @param fields the {@link Field}s of the index
      * @return the result of the create command
+     * @since 6.6
+     * @see <a href="https://redis.io/docs/latest/commands/ft.create/">FT.CREATE</a>
      */
-    Mono<String> ftCreate(K index, CreateArgs<K, V> options, Fields<K> fields);
+    Mono<String> ftCreate(K index, CreateArgs<K, V> options, List<Field<K>> fields);
 
 }

src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java

@@ -31,12 +31,13 @@
  * @author Mark Paluch
  * @since 5.0
  */
-public interface RedisReactiveCommands<K, V> extends BaseRedisReactiveCommands<K, V>, RedisAclReactiveCommands<K, V>,
-        RedisClusterReactiveCommands<K, V>, RedisFunctionReactiveCommands<K, V>, RedisGeoReactiveCommands<K, V>,
-        RedisHashReactiveCommands<K, V>, RedisHLLReactiveCommands<K, V>, RedisKeyReactiveCommands<K, V>,
-        RedisListReactiveCommands<K, V>, RedisScriptingReactiveCommands<K, V>, RedisServerReactiveCommands<K, V>,
-        RedisSetReactiveCommands<K, V>, RedisSortedSetReactiveCommands<K, V>, RedisStreamReactiveCommands<K, V>,
-        RedisStringReactiveCommands<K, V>, RedisTransactionalReactiveCommands<K, V>, RedisJsonReactiveCommands<K, V> {
+public interface RedisReactiveCommands<K, V>
+        extends BaseRedisReactiveCommands<K, V>, RedisAclReactiveCommands<K, V>, RedisClusterReactiveCommands<K, V>,
+        RedisFunctionReactiveCommands<K, V>, RedisGeoReactiveCommands<K, V>, RedisHashReactiveCommands<K, V>,
+        RedisHLLReactiveCommands<K, V>, RedisKeyReactiveCommands<K, V>, RedisListReactiveCommands<K, V>,
+        RedisScriptingReactiveCommands<K, V>, RedisServerReactiveCommands<K, V>, RedisSetReactiveCommands<K, V>,
+        RedisSortedSetReactiveCommands<K, V>, RedisStreamReactiveCommands<K, V>, RedisStringReactiveCommands<K, V>,
+        RedisTransactionalReactiveCommands<K, V>, RedisJsonReactiveCommands<K, V>, RediSearchReactiveCommands<K, V> {
 
     /**
      * Authenticate to the server.

src/main/java/io/lettuce/core/api/sync/RediSearchCommands.java

@@ -6,7 +6,8 @@
  */
 package io.lettuce.core.api.sync;
 
-import io.lettuce.core.search.Fields;
+import java.util.List;
+import io.lettuce.core.search.Field;
 import io.lettuce.core.search.arguments.CreateArgs;
 
 /**
@@ -22,13 +23,15 @@
 public interface RediSearchCommands<K, V> {
 
     /**
-     * Create a new index with the given name, index options and fields.
+     * Create a new index with the given name, index options, and fields.
      *
-     * @param index the index name
-     * @param options the index options
-     * @param fields the fields
+     * @param index the index name, as a key
+     * @param options the index {@link CreateArgs}
+     * @param fields the {@link Field}s of the index
      * @return the result of the create command
+     * @since 6.6
+     * @see <a href="https://redis.io/docs/latest/commands/ft.create/">FT.CREATE</a>
      */
-    String ftCreate(K index, CreateArgs<K, V> options, Fields<K> fields);
+    String ftCreate(K index, CreateArgs<K, V> options, List<Field<K>> fields);
 
 }

src/main/java/io/lettuce/core/cluster/api/async/RediSearchAsyncCommands.java

@@ -6,7 +6,8 @@
  */
 package io.lettuce.core.cluster.api.async;
 
-import io.lettuce.core.search.Fields;
+import java.util.List;
+import io.lettuce.core.search.Field;
 import io.lettuce.core.search.arguments.CreateArgs;
 
 /**
@@ -22,13 +23,15 @@
 public interface RediSearchAsyncCommands<K, V> {
 
     /**
-     * Create a new index with the given name, index options and fields.
+     * Create a new index with the given name, index options, and fields.
      *
-     * @param index the index name
-     * @param options the index options
-     * @param fields the fields
+     * @param index the index name, as a key
+     * @param options the index {@link CreateArgs}
+     * @param fields the {@link Field}s of the index
      * @return the result of the create command
+     * @since 6.6
+     * @see <a href="https://redis.io/docs/latest/commands/ft.create/">FT.CREATE</a>
      */
-    AsyncExecutions<String> ftCreate(K index, CreateArgs<K, V> options, Fields<K> fields);
+    AsyncExecutions<String> ftCreate(K index, CreateArgs<K, V> options, List<Field<K>> fields);
 
 }

src/main/java/io/lettuce/core/cluster/api/sync/RediSearchCommands.java

@@ -6,8 +6,8 @@
  */
 package io.lettuce.core.cluster.api.sync;
 
+import java.util.List;
 import io.lettuce.core.search.Field;
-import io.lettuce.core.search.Fields;
 import io.lettuce.core.search.arguments.CreateArgs;
 
 /**
@@ -23,13 +23,15 @@
 public interface RediSearchCommands<K, V> {
 
     /**
-     * Create a new index with the given name, index options and fields.
+     * Create a new index with the given name, index options, and fields.
      *
-     * @param index the index name
-     * @param options the index options
-     * @param fields the fields
+     * @param index the index name, as a key
+     * @param options the index {@link CreateArgs}
+     * @param fields the {@link Field}s of the index
      * @return the result of the create command
+     * @since 6.6
+     * @see <a href="https://redis.io/docs/latest/commands/ft.create/">FT.CREATE</a>
      */
-    Executions<String> ftCreate(K index, CreateArgs<K, V> options, Fields<K> fields);
+    Executions<String> ftCreate(K index, CreateArgs<K, V> options, List<Field<K>> fields);
 
 }

src/main/java/io/lettuce/core/search/Field.java

@@ -8,6 +8,8 @@
 
 import io.lettuce.core.protocol.CommandArgs;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
 
 import static io.lettuce.core.protocol.CommandKeyword.*;
@@ -359,9 +361,10 @@ public Field<K> build() {
          *
          * @return the instance of the {@link Field}
          */
-        public Fields<K> buildFields() {
-            Fields<K> fields = new Fields<>();
-            return fields.add(instance);
+        public List<Field<K>> buildFields() {
+            List<Field<K>> fields = new ArrayList<>();
+            fields.add(instance);
+            return fields;
         }
 
     }

src/main/java/io/lettuce/core/search/arguments/CreateArgs.java

@@ -316,6 +316,8 @@ public Builder<K, V> skipInitialScan(boolean skipInitialScan) {
          *
          * @param stopWords a list of stop words
          * @return the instance of the current {@link Builder} for the purpose of method chaining
+         * @see <a href="https://redis.io/docs/latest/develop/interact/search-and-query/advanced-concepts/stopwords/">Stop
+         *      words</a>
          */
         public Builder<K, V> stopWords(List<V> stopWords) {
             instance.stopWords = Optional.of(stopWords);

src/main/kotlin/io/lettuce/core/api/coroutines/RediSearchCoroutinesCommands.kt

@@ -4,10 +4,12 @@
  *
  * Licensed under the MIT License.
  */
+
 package io.lettuce.core.api.coroutines
 
 import io.lettuce.core.ExperimentalLettuceCoroutinesApi
-import io.lettuce.core.search.Fields
+import kotlinx.coroutines.flow.Flow
+import io.lettuce.core.search.Field
 import io.lettuce.core.search.arguments.CreateArgs
 
 /**
@@ -18,20 +20,22 @@ import io.lettuce.core.search.arguments.CreateArgs
  * @author Tihomir Mateev
  * @see <a href="https://redis.io/docs/latest/operate/oss_and_stack/stack-with-enterprise/search/">RediSearch</a>
  * @since 6.6
- * @generated by io.lettuce.apigenerator.CreateKotlinCoroutinesApi
+ * @generated by io.lettuce.apigenerator.CreateKotlinCoroutinesApi
  */
 @ExperimentalLettuceCoroutinesApi
 interface RediSearchCoroutinesCommands<K : Any, V : Any> {
 
     /**
-     * Create a new index with the given name, index options and fields.
+     * Create a new index with the given name, index options, and fields.
      *
-     * @param index the index name
-     * @param options the index options
-     * @param fields the fields
+     * @param index the index name, as a key
+     * @param options the index [CreateArgs]
+     * @param fields the [Field]s of the index
      * @return the result of the create command
+     * @since 6.6
+     * @see <a href="https://redis.io/docs/latest/commands/ft.create/">FT.CREATE</a>
      */
-    suspend fun ftCreate(index: K, options: CreateArgs<K, V>, fields: Fields<K>): String?
+    suspend fun ftCreate(index: K, options: CreateArgs<K, V>, fields: List<Field<K>>): String?
 
 }
 

src/main/templates/io/lettuce/core/api/RediSearchCommands.java

@@ -6,9 +6,10 @@
  */
 package io.lettuce.core.api;
 
-import io.lettuce.core.search.Fields;
-import io.lettuce.core.search.arguments.CreateArgs;
 import io.lettuce.core.search.Field;
+import io.lettuce.core.search.arguments.CreateArgs;
+
+import java.util.List;
 
 /**
  * ${intent} for RediSearch functionality
@@ -22,13 +23,15 @@
 public interface RediSearchCommands<K, V> {
 
     /**
-     * Create a new index with the given name, index options and fields.
+     * Create a new index with the given name, index options, and fields.
      *
-     * @param index the index name
-     * @param options the index options
-     * @param fields the fields
+     * @param index the index name, as a key
+     * @param options the index {@link CreateArgs}
+     * @param fields the {@link Field}s of the index
      * @return the result of the create command
+     * @since 6.6
+     * @see <a href="https://redis.io/docs/latest/commands/ft.create/">FT.CREATE</a>
      */
-    String ftCreate(K index, CreateArgs<K, V> options, Fields<K> fields);
+    String ftCreate(K index, CreateArgs<K, V> options, List<Field<K>> fields);
 
 }