Remove Graph module support (#4073)

redis · Jan 31, 2025 · cbab71c · cbab71c
1 parent cd9346a
commit cbab71c
Show file tree

Hide file tree

Showing 44 changed files with 4 additions and 4,168 deletions.
diff --git a/src/main/java/redis/clients/jedis/ClusterPipeline.java b/src/main/java/redis/clients/jedis/ClusterPipeline.java
@@ -46,13 +46,6 @@ private static ClusterCommandObjects createClusterCommandObjects(RedisProtocol p
     return cco;
   }
 
-  /**
-   * This method must be called after constructor, if graph commands are going to be used.
-   */
-  public void prepareGraphCommands() {
-    super.prepareGraphCommands(provider);
-  }
-
   @Override
   public void close() {
     try {

diff --git a/src/main/java/redis/clients/jedis/CommandObjects.java b/src/main/java/redis/clients/jedis/CommandObjects.java
@@ -19,7 +19,6 @@
 import redis.clients.jedis.bloom.*;
 import redis.clients.jedis.bloom.RedisBloomProtocol.*;
 import redis.clients.jedis.commands.ProtocolCommand;
-import redis.clients.jedis.graph.GraphProtocol.*;
 import redis.clients.jedis.json.*;
 import redis.clients.jedis.json.JsonProtocol.JsonCommand;
 import redis.clients.jedis.json.DefaultGsonObjectMapper;
@@ -4382,38 +4381,6 @@ public final CommandObject<List<Double>> tdigestByRevRank(String key, long... ra
   }
   // RedisBloom commands
 
-  // RedisGraph commands
-  @Deprecated
-  public final CommandObject<List<String>> graphList() {
-    return new CommandObject<>(commandArguments(GraphCommand.LIST), BuilderFactory.STRING_LIST);
-  }
-
-  @Deprecated
-  public final CommandObject<List<String>> graphProfile(String graphName, String query) {
-    return new CommandObject<>(commandArguments(GraphCommand.PROFILE).key(graphName).add(query), BuilderFactory.STRING_LIST);
-  }
-
-  @Deprecated
-  public final CommandObject<List<String>> graphExplain(String graphName, String query) {
-    return new CommandObject<>(commandArguments(GraphCommand.EXPLAIN).key(graphName).add(query), BuilderFactory.STRING_LIST);
-  }
-
-  @Deprecated
-  public final CommandObject<List<List<Object>>> graphSlowlog(String graphName) {
-    return new CommandObject<>(commandArguments(GraphCommand.SLOWLOG).key(graphName), BuilderFactory.ENCODED_OBJECT_LIST_LIST);
-  }
-
-  @Deprecated
-  public final CommandObject<String> graphConfigSet(String configName, Object value) {
-    return new CommandObject<>(commandArguments(GraphCommand.CONFIG).add(GraphKeyword.SET).add(configName).add(value), BuilderFactory.STRING);
-  }
-
-  @Deprecated
-  public final CommandObject<Map<String, Object>> graphConfigGet(String configName) {
-    return new CommandObject<>(commandArguments(GraphCommand.CONFIG).add(GraphKeyword.GET).add(configName), BuilderFactory.ENCODED_OBJECT_MAP);
-  }
-  // RedisGraph commands
-
   // Transaction commands
   public final CommandObject<String> watch(String... keys) {
     return new CommandObject<>(commandArguments(WATCH).keys((Object[]) keys), BuilderFactory.STRING);

diff --git a/src/main/java/redis/clients/jedis/MultiNodePipelineBase.java b/src/main/java/redis/clients/jedis/MultiNodePipelineBase.java
@@ -14,8 +14,6 @@
 import org.slf4j.LoggerFactory;
 
 import redis.clients.jedis.exceptions.JedisConnectionException;
-import redis.clients.jedis.graph.GraphCommandObjects;
-import redis.clients.jedis.providers.ConnectionProvider;
 import redis.clients.jedis.util.IOUtils;
 
 public abstract class MultiNodePipelineBase extends PipelineBase {
@@ -39,16 +37,6 @@ public MultiNodePipelineBase(CommandObjects commandObjects) {
     connections = new LinkedHashMap<>();
   }
 
-  /**
-   * Sub-classes must call this method, if graph commands are going to be used.
-   * @param connectionProvider connection provider
-   */
-  protected final void prepareGraphCommands(ConnectionProvider connectionProvider) {
-    GraphCommandObjects graphCommandObjects = new GraphCommandObjects(connectionProvider);
-    graphCommandObjects.setBaseCommandArgumentsCreator((comm) -> this.commandObjects.commandArguments(comm));
-    super.setGraphCommands(graphCommandObjects);
-  }
-
   protected abstract HostAndPort getNodeKey(CommandArguments args);
 
   protected abstract Connection getConnection(HostAndPort nodeKey);

diff --git a/src/main/java/redis/clients/jedis/Pipeline.java b/src/main/java/redis/clients/jedis/Pipeline.java
@@ -8,7 +8,6 @@
 
 import redis.clients.jedis.commands.DatabasePipelineCommands;
 import redis.clients.jedis.exceptions.JedisDataException;
-import redis.clients.jedis.graph.GraphCommandObjects;
 import redis.clients.jedis.params.*;
 import redis.clients.jedis.util.IOUtils;
 import redis.clients.jedis.util.KeyValue;
@@ -43,9 +42,6 @@ private static CommandObjects createCommandObjects(Connection connection) {
     super(commandObjects);
     this.connection = connection;
     this.closeConnection = closeConnection;
-    GraphCommandObjects graphCommandObjects = new GraphCommandObjects(this.connection);
-    graphCommandObjects.setBaseCommandArgumentsCreator(protocolCommand -> commandObjects.commandArguments(protocolCommand));
-    setGraphCommands(graphCommandObjects);
   }
 
   @Override

diff --git a/src/main/java/redis/clients/jedis/PipeliningBase.java b/src/main/java/redis/clients/jedis/PipeliningBase.java
@@ -11,8 +11,6 @@
 import redis.clients.jedis.commands.PipelineCommands;
 import redis.clients.jedis.commands.ProtocolCommand;
 import redis.clients.jedis.commands.RedisModulePipelineCommands;
-import redis.clients.jedis.graph.GraphCommandObjects;
-import redis.clients.jedis.graph.ResultSet;
 import redis.clients.jedis.json.JsonSetParams;
 import redis.clients.jedis.json.Path;
 import redis.clients.jedis.json.Path2;
@@ -30,19 +28,11 @@ public abstract class PipeliningBase
     implements PipelineCommands, PipelineBinaryCommands, RedisModulePipelineCommands {
 
   protected final CommandObjects commandObjects;
-  private GraphCommandObjects graphCommandObjects;
 
   protected PipeliningBase(CommandObjects commandObjects) {
     this.commandObjects = commandObjects;
   }
 
-  /**
-   * Sub-classes must call this method, if graph commands are going to be used.
-   */
-  protected final void setGraphCommands(GraphCommandObjects graphCommandObjects) {
-    this.graphCommandObjects = graphCommandObjects;
-  }
-
   protected abstract <T> Response<T> appendCommand(CommandObject<T> commandObject);
 
   @Override
@@ -4370,58 +4360,6 @@ public Response<List<Double>> tdigestByRevRank(String key, long... ranks) {
   }
   // RedisBloom commands
 
-  // RedisGraph commands
-  @Override
-  public Response<ResultSet> graphQuery(String name, String query) {
-    return appendCommand(graphCommandObjects.graphQuery(name, query));
-  }
-
-  @Override
-  public Response<ResultSet> graphReadonlyQuery(String name, String query) {
-    return appendCommand(graphCommandObjects.graphReadonlyQuery(name, query));
-  }
-
-  @Override
-  public Response<ResultSet> graphQuery(String name, String query, long timeout) {
-    return appendCommand(graphCommandObjects.graphQuery(name, query, timeout));
-  }
-
-  @Override
-  public Response<ResultSet> graphReadonlyQuery(String name, String query, long timeout) {
-    return appendCommand(graphCommandObjects.graphReadonlyQuery(name, query, timeout));
-  }
-
-  @Override
-  public Response<ResultSet> graphQuery(String name, String query, Map<String, Object> params) {
-    return appendCommand(graphCommandObjects.graphQuery(name, query, params));
-  }
-
-  @Override
-  public Response<ResultSet> graphReadonlyQuery(String name, String query, Map<String, Object> params) {
-    return appendCommand(graphCommandObjects.graphReadonlyQuery(name, query, params));
-  }
-
-  @Override
-  public Response<ResultSet> graphQuery(String name, String query, Map<String, Object> params, long timeout) {
-    return appendCommand(graphCommandObjects.graphQuery(name, query, params, timeout));
-  }
-
-  @Override
-  public Response<ResultSet> graphReadonlyQuery(String name, String query, Map<String, Object> params, long timeout) {
-    return appendCommand(graphCommandObjects.graphReadonlyQuery(name, query, params, timeout));
-  }
-
-  @Override
-  public Response<String> graphDelete(String name) {
-    return appendCommand(graphCommandObjects.graphDelete(name));
-  }
-
-  @Override
-  public Response<List<String>> graphProfile(String graphName, String query) {
-    return appendCommand(commandObjects.graphProfile(graphName, query));
-  }
-  // RedisGraph commands
-
   public Response<Object> sendCommand(ProtocolCommand cmd, String... args) {
     return sendCommand(new CommandArguments(cmd).addObjects((Object[]) args));
   }

diff --git a/src/main/java/redis/clients/jedis/ReliableTransaction.java b/src/main/java/redis/clients/jedis/ReliableTransaction.java
@@ -13,7 +13,6 @@
 import redis.clients.jedis.exceptions.JedisConnectionException;
 import redis.clients.jedis.exceptions.JedisDataException;
 import redis.clients.jedis.exceptions.JedisException;
-import redis.clients.jedis.graph.GraphCommandObjects;
 
 /**
  * A transaction where commands are immediately sent to Redis server and the {@code QUEUED} reply checked.
@@ -82,9 +81,6 @@ public ReliableTransaction(Connection connection, boolean doMulti, boolean close
     super(commandObjects);
     this.connection = connection;
     this.closeConnection = closeConnection;
-    GraphCommandObjects graphCommandObjects = new GraphCommandObjects(this.connection);
-    graphCommandObjects.setBaseCommandArgumentsCreator(protocolCommand -> commandObjects.commandArguments(protocolCommand));
-    setGraphCommands(graphCommandObjects);
     if (doMulti) multi();
   }
 

diff --git a/src/main/java/redis/clients/jedis/ShardedPipeline.java b/src/main/java/redis/clients/jedis/ShardedPipeline.java
@@ -57,11 +57,4 @@ protected HostAndPort getNodeKey(CommandArguments args) {
   protected Connection getConnection(HostAndPort nodeKey) {
     return provider.getConnection(nodeKey);
   }
-
-  /**
-   * This method must be called after constructor, if graph commands are going to be used.
-   */
-  public void prepareGraphCommands() {
-    super.prepareGraphCommands(provider);
-  }
 }
diff --git a/src/main/java/redis/clients/jedis/Transaction.java b/src/main/java/redis/clients/jedis/Transaction.java
@@ -12,7 +12,6 @@
 
 import redis.clients.jedis.exceptions.JedisConnectionException;
 import redis.clients.jedis.exceptions.JedisDataException;
-import redis.clients.jedis.graph.GraphCommandObjects;
 
 /**
  * A transaction based on <a href="https://redis.io/docs/manual/pipelining/">pipelining</a>.
@@ -90,9 +89,6 @@ public Transaction(Connection connection, boolean doMulti, boolean closeConnecti
     super(commandObjects);
     this.connection = connection;
     this.closeConnection = closeConnection;
-    GraphCommandObjects graphCommandObjects = new GraphCommandObjects(this.connection);
-    graphCommandObjects.setBaseCommandArgumentsCreator(protocolCommand -> commandObjects.commandArguments(protocolCommand));
-    setGraphCommands(graphCommandObjects);
     if (doMulti) multi();
   }
 

diff --git a/src/main/java/redis/clients/jedis/UnifiedJedis.java b/src/main/java/redis/clients/jedis/UnifiedJedis.java
@@ -25,8 +25,6 @@
 import redis.clients.jedis.csc.CacheFactory;
 import redis.clients.jedis.exceptions.JedisException;
 import redis.clients.jedis.executors.*;
-import redis.clients.jedis.graph.GraphCommandObjects;
-import redis.clients.jedis.graph.ResultSet;
 import redis.clients.jedis.json.JsonSetParams;
 import redis.clients.jedis.json.Path;
 import redis.clients.jedis.json.Path2;
@@ -56,7 +54,6 @@ public class UnifiedJedis implements JedisCommands, JedisBinaryCommands,
   protected final ConnectionProvider provider;
   protected final CommandExecutor executor;
   protected final CommandObjects commandObjects;
-  private final GraphCommandObjects graphCommandObjects;
   private JedisBroadcastAndRoundRobinConfig broadcastAndRoundRobinConfig = null;
   private final Cache cache;
 
@@ -164,7 +161,6 @@ public UnifiedJedis(Connection connection) {
     if (proto != null) {
       this.commandObjects.setProtocol(proto);
     }
-    this.graphCommandObjects = new GraphCommandObjects(this);
     if (connection instanceof CacheConnection) {
       this.cache = ((CacheConnection) connection).getCache();
     } else {
@@ -297,8 +293,6 @@ private UnifiedJedis(CommandExecutor executor, ConnectionProvider provider, Comm
       this.commandObjects.setProtocol(protocol);
     }
 
-    this.graphCommandObjects = new GraphCommandObjects(this);
-    this.graphCommandObjects.setBaseCommandArgumentsCreator((comm) -> this.commandObjects.commandArguments(comm));
     this.cache = cache;
   }
 
@@ -4962,98 +4956,6 @@ public List<Double> tdigestByRevRank(String key, long... ranks) {
   }
   // RedisBloom commands
 
-  // RedisGraph commands
-  @Override
-  @Deprecated
-  public ResultSet graphQuery(String name, String query) {
-    return executeCommand(graphCommandObjects.graphQuery(name, query));
-  }
-
-  @Override
-  @Deprecated
-  public ResultSet graphReadonlyQuery(String name, String query) {
-    return executeCommand(graphCommandObjects.graphReadonlyQuery(name, query));
-  }
-
-  @Override
-  @Deprecated
-  public ResultSet graphQuery(String name, String query, long timeout) {
-    return executeCommand(graphCommandObjects.graphQuery(name, query, timeout));
-  }
-
-  @Override
-  @Deprecated
-  public ResultSet graphReadonlyQuery(String name, String query, long timeout) {
-    return executeCommand(graphCommandObjects.graphReadonlyQuery(name, query, timeout));
-  }
-
-  @Override
-  @Deprecated
-  public ResultSet graphQuery(String name, String query, Map<String, Object> params) {
-    return executeCommand(graphCommandObjects.graphQuery(name, query, params));
-  }
-
-  @Override
-  @Deprecated
-  public ResultSet graphReadonlyQuery(String name, String query, Map<String, Object> params) {
-    return executeCommand(graphCommandObjects.graphReadonlyQuery(name, query, params));
-  }
-
-  @Override
-  @Deprecated
-  public ResultSet graphQuery(String name, String query, Map<String, Object> params, long timeout) {
-    return executeCommand(graphCommandObjects.graphQuery(name, query, params, timeout));
-  }
-
-  @Override
-  @Deprecated
-  public ResultSet graphReadonlyQuery(String name, String query, Map<String, Object> params, long timeout) {
-    return executeCommand(graphCommandObjects.graphReadonlyQuery(name, query, params, timeout));
-  }
-
-  @Override
-  @Deprecated
-  public String graphDelete(String name) {
-    return executeCommand(graphCommandObjects.graphDelete(name));
-  }
-
-  @Override
-  @Deprecated
-  public List<String> graphList() {
-    return executeCommand(commandObjects.graphList());
-  }
-
-  @Override
-  @Deprecated
-  public List<String> graphProfile(String graphName, String query) {
-    return executeCommand(commandObjects.graphProfile(graphName, query));
-  }
-
-  @Override
-  @Deprecated
-  public List<String> graphExplain(String graphName, String query) {
-    return executeCommand(commandObjects.graphExplain(graphName, query));
-  }
-
-  @Override
-  @Deprecated
-  public List<List<Object>> graphSlowlog(String graphName) {
-    return executeCommand(commandObjects.graphSlowlog(graphName));
-  }
-
-  @Override
-  @Deprecated
-  public String graphConfigSet(String configName, Object value) {
-    return executeCommand(commandObjects.graphConfigSet(configName, value));
-  }
-
-  @Override
-  @Deprecated
-  public Map<String, Object> graphConfigGet(String configName) {
-    return executeCommand(commandObjects.graphConfigGet(configName));
-  }
-  // RedisGraph commands
-
   /**
    * @return pipeline object. Use {@link AbstractPipeline} instead of {@link PipelineBase}.
    */

diff --git a/src/main/java/redis/clients/jedis/commands/RedisModuleCommands.java b/src/main/java/redis/clients/jedis/commands/RedisModuleCommands.java
@@ -1,7 +1,6 @@
 package redis.clients.jedis.commands;
 
 import redis.clients.jedis.bloom.commands.RedisBloomCommands;
-import redis.clients.jedis.graph.RedisGraphCommands;
 import redis.clients.jedis.json.commands.RedisJsonCommands;
 import redis.clients.jedis.search.RediSearchCommands;
 import redis.clients.jedis.timeseries.RedisTimeSeriesCommands;
@@ -10,7 +9,6 @@ public interface RedisModuleCommands extends
     RediSearchCommands,
     RedisJsonCommands,
     RedisTimeSeriesCommands,
-    RedisBloomCommands,
-    RedisGraphCommands {
+    RedisBloomCommands {
 
 }