Merge branch 'master' into search-dialect-default-2

Author: sazzad16

.github/workflows/docs.yml

@@ -14,10 +14,10 @@ jobs:
     concurrency: ci-${{ github.ref }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: 3.13
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
@@ -33,4 +33,4 @@ jobs:
           path: 'docsbuild'
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v2

.github/workflows/test-on-docker.yml

@@ -36,14 +36,14 @@ jobs:
       fail-fast: false
       matrix:
         redis_version:
-          - "8.0-M02"
+          - "8.0-M04-pre"
           - "7.4.1"
           - "7.2.6"
           # - "6.2.16"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up publishing to maven central
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           java-version: '8'
           distribution: 'temurin'
@@ -53,7 +53,7 @@ jobs:
           sudo apt install -y make
           make compile-module
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.m2/repository
@@ -124,7 +124,7 @@ jobs:
         continue-on-error: true
       # Upload code coverage
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           fail_ci_if_error: false
           token: ${{ secrets.CODECOV_TOKEN }}

Makefile

@@ -1,8 +1,8 @@
 PATH := ./redis-git/src:${PATH}
 
 # Supported test env versions
-SUPPORTED_TEST_ENV_VERSIONS := 8.0-M02 7.4.1 7.2.6 6.2.16
-DEFAULT_TEST_ENV_VERSION := 8.0-M02
+SUPPORTED_TEST_ENV_VERSIONS := 8.0-M04-pre, 8.0-M02 7.4.1 7.2.6 6.2.16
+DEFAULT_TEST_ENV_VERSION := 8.0-M04-pre
 REDIS_ENV_WORK_DIR := $(or ${REDIS_ENV_WORK_DIR},/tmp/redis-env-work)
 
 define REDIS1_CONF

src/main/java/redis/clients/jedis/CommandObjects.java

@@ -3531,19 +3531,23 @@ public final CommandObject<Set<String>> ftTagVals(String indexName, String field
         .add(fieldName), BuilderFactory.STRING_SET);
   }
 
+  @Deprecated
   public final CommandObject<Map<String, Object>> ftConfigGet(String option) {
     return new CommandObject<>(commandArguments(SearchCommand.CONFIG).add(SearchKeyword.GET).add(option),
         protocol == RedisProtocol.RESP3 ? BuilderFactory.AGGRESSIVE_ENCODED_OBJECT_MAP : BuilderFactory.ENCODED_OBJECT_MAP_FROM_PAIRS);
   }
 
+  @Deprecated
   public final CommandObject<Map<String, Object>> ftConfigGet(String indexName, String option) {
     return directSearchCommand(ftConfigGet(option), indexName);
   }
 
+  @Deprecated
   public final CommandObject<String> ftConfigSet(String option, String value) {
     return new CommandObject<>(commandArguments(SearchCommand.CONFIG).add(SearchKeyword.SET).add(option).add(value), BuilderFactory.STRING);
   }
 
+  @Deprecated
   public final CommandObject<String> ftConfigSet(String indexName, String option, String value) {
     return directSearchCommand(ftConfigSet(option, value), indexName);
   }

src/main/java/redis/clients/jedis/PipeliningBase.java

@@ -3565,21 +3565,25 @@ public Response<Set<String>> ftTagVals(String indexName, String fieldName) {
   }
 
   @Override
+  @Deprecated
   public Response<Map<String, Object>> ftConfigGet(String option) {
     return appendCommand(commandObjects.ftConfigGet(option));
   }
 
   @Override
+  @Deprecated
   public Response<Map<String, Object>> ftConfigGet(String indexName, String option) {
     return appendCommand(commandObjects.ftConfigGet(indexName, option));
   }
 
   @Override
+  @Deprecated
   public Response<String> ftConfigSet(String option, String value) {
     return appendCommand(commandObjects.ftConfigSet(option, value));
   }
 
   @Override
+  @Deprecated
   public Response<String> ftConfigSet(String indexName, String option, String value) {
     return appendCommand(commandObjects.ftConfigSet(indexName, option, value));
   }

src/main/java/redis/clients/jedis/UnifiedJedis.java

@@ -4067,21 +4067,25 @@ public Set<String> ftTagVals(String indexName, String fieldName) {
   }
 
   @Override
+  @Deprecated
   public Map<String, Object> ftConfigGet(String option) {
     return executeCommand(commandObjects.ftConfigGet(option));
   }
 
   @Override
+  @Deprecated
   public Map<String, Object> ftConfigGet(String indexName, String option) {
     return executeCommand(commandObjects.ftConfigGet(indexName, option));
   }
 
   @Override
+  @Deprecated
   public String ftConfigSet(String option, String value) {
     return executeCommand(commandObjects.ftConfigSet(option, value));
   }
 
   @Override
+  @Deprecated
   public String ftConfigSet(String indexName, String option, String value) {
     return executeCommand(commandObjects.ftConfigSet(indexName, option, value));
   }

src/main/java/redis/clients/jedis/search/RediSearchCommands.java

@@ -5,6 +5,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import redis.clients.jedis.commands.ConfigCommands;
 import redis.clients.jedis.resps.Tuple;
 import redis.clients.jedis.search.aggr.AggregationBuilder;
 import redis.clients.jedis.search.aggr.AggregationResult;
@@ -107,12 +108,22 @@ Map<String, Map<String, Double>> ftSpellCheck(String index, String query,
 
   Set<String> ftTagVals(String indexName, String fieldName);
 
+  /**
+   * @deprecated {@link ConfigCommands#configGet(java.lang.String)} is used since Redis 8.
+   */
+  @Deprecated
   Map<String, Object> ftConfigGet(String option);
 
+  @Deprecated
   Map<String, Object> ftConfigGet(String indexName, String option);
 
+  /**
+   * @deprecated {@link ConfigCommands#configSet(java.lang.String, java.lang.String)} is used since Redis 8.
+   */
+  @Deprecated
   String ftConfigSet(String option, String value);
 
+  @Deprecated
   String ftConfigSet(String indexName, String option, String value);
 
   long ftSugAdd(String key, String string, double score);

src/main/java/redis/clients/jedis/search/RediSearchPipelineCommands.java

@@ -95,12 +95,16 @@ Response<Map<String, Map<String, Double>>> ftSpellCheck(String index, String que
 
   Response<Set<String>> ftTagVals(String indexName, String fieldName);
 
+  @Deprecated
   Response<Map<String, Object>> ftConfigGet(String option);
 
+  @Deprecated
   Response<Map<String, Object>> ftConfigGet(String indexName, String option);
 
+  @Deprecated
   Response<String> ftConfigSet(String option, String value);
 
+  @Deprecated
   Response<String> ftConfigSet(String indexName, String option, String value);
 
   Response<Long> ftSugAdd(String key, String string, double score);

src/main/java/redis/clients/jedis/search/SearchProtocol.java

@@ -16,7 +16,7 @@ public enum SearchCommand implements ProtocolCommand {
     EXPLAINCLI("FT.EXPLAINCLI"),
     AGGREGATE("FT.AGGREGATE"),
     CURSOR("FT.CURSOR"),
-    CONFIG("FT.CONFIG"),
+    @Deprecated CONFIG("FT.CONFIG"),
     ALIASADD("FT.ALIASADD"),
     ALIASUPDATE("FT.ALIASUPDATE"),
     ALIASDEL("FT.ALIASDEL"),
@@ -52,11 +52,12 @@ public enum SearchKeyword implements Rawable {
     SCHEMA, TEXT, TAG, NUMERIC, GEO, GEOSHAPE, VECTOR, VERBATIM, NOCONTENT, NOSTOPWORDS, WITHSCORES,
     LANGUAGE, INFIELDS, SORTBY, ASC, DESC, LIMIT, HIGHLIGHT, FIELDS, TAGS, SUMMARIZE, FRAGS, LEN,
     SEPARATOR, INKEYS, RETURN, FILTER, GEOFILTER, ADD, INCR, MAX, FUZZY, READ, DEL, DD, TEMPORARY,
-    STOPWORDS, NOFREQS, NOFIELDS, NOOFFSETS, NOHL, SET, GET, ON, SORTABLE, UNF, PREFIX,
+    STOPWORDS, NOFREQS, NOFIELDS, NOOFFSETS, NOHL, ON, SORTABLE, UNF, PREFIX,
     LANGUAGE_FIELD, SCORE, SCORE_FIELD, SCORER, PARAMS, AS, DIALECT, SLOP, TIMEOUT, INORDER,
     EXPANDER, MAXTEXTFIELDS, SKIPINITIALSCAN, WITHSUFFIXTRIE, NOSTEM, NOINDEX, PHONETIC, WEIGHT,
     CASESENSITIVE, LOAD, APPLY, GROUPBY, MAXIDLE, WITHCURSOR, DISTANCE, TERMS, INCLUDE, EXCLUDE,
-    SEARCH, AGGREGATE, QUERY, LIMITED, COUNT, REDUCE, INDEXMISSING, INDEXEMPTY, ADDSCORES;
+    SEARCH, AGGREGATE, QUERY, LIMITED, COUNT, REDUCE, INDEXMISSING, INDEXEMPTY, ADDSCORES,
+    @Deprecated SET, @Deprecated GET;
 
     private final byte[] raw;
 

src/test/java/io/redis/examples/CmdsCnxmgmtExample.java

@@ -0,0 +1,49 @@
+// EXAMPLE: cmds_cnxmgmt
+// REMOVE_START
+package io.redis.examples;
+
+import org.junit.Assert;
+import org.junit.Test;
+// REMOVE_END
+
+import redis.clients.jedis.Jedis;
+
+// HIDE_START
+public class CmdsCnxmgmtExample {
+    @Test
+    public void run() {
+// HIDE_END
+        Jedis jedis = new Jedis("redis://localhost:6379");
+
+        // STEP_START auth1
+        // REMOVE_START
+        jedis.configSet("requirepass", "temp_pass");
+        // REMOVE_END
+        // Note: you must use the `Jedis` class rather than `UnifiedJedis`
+        // to access the `auth` commands.
+        String authResult1 = jedis.auth("default",  "temp_pass");
+        System.out.println(authResult1); // >>> OK
+        // REMOVE_START
+        Assert.assertEquals("OK", authResult1);
+        jedis.configSet("requirepass", "");
+        // REMOVE_END
+        // STEP_END
+       
+        // STEP_START auth2
+        // REMOVE_START
+        jedis.aclSetUser("test-user", "on", ">strong_password", "+acl");
+        // REMOVE_END
+        // Note: you must use the `Jedis` class rather than `UnifiedJedis`
+        // to access the `auth` commands.
+        String authResult2 = jedis.auth("test-user", "strong_password");
+        System.out.println(authResult2); // >>> OK
+        // REMOVE_START
+        Assert.assertEquals("OK", authResult2);
+        jedis.aclDelUser("test-user");
+        // REMOVE_END
+        // STEP_END
+        
+        // HIDE_START
+    }
+}
+// HIDE_END