Add support for LMOVE and BLMOVE commands

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

@@ -24,6 +24,7 @@
 import javax.net.ssl.SSLSocketFactory;
 
 import redis.clients.jedis.Protocol.Keyword;
+import redis.clients.jedis.args.ListDirection;
 import redis.clients.jedis.args.FlushMode;
 import redis.clients.jedis.args.UnblockType;
 import redis.clients.jedis.params.*;
@@ -719,6 +720,14 @@ public void sort(final byte[] key, final SortingParams sortingParameters) {
     sendCommand(SORT, args.toArray(new byte[args.size()][]));
   }
 
+  public void lmove(byte[] srcKey, byte[] dstKey, ListDirection from, ListDirection to) {
+    sendCommand(LMOVE, srcKey, dstKey, from.getRaw(), to.getRaw());
+  }
+
+  public void blmove(byte[] srcKey, byte[] dstKey, ListDirection from, ListDirection to, int timeout) {
+    sendCommand(BLMOVE, srcKey, dstKey, from.getRaw(), to.getRaw(), toByteArray(timeout));
+  }
+
   public void blpop(final byte[][] args) {
     sendCommand(BLPOP, args);
   }

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

@@ -21,6 +21,7 @@
 import javax.net.ssl.SSLParameters;
 import javax.net.ssl.SSLSocketFactory;
 
+import redis.clients.jedis.args.ListDirection;
 import redis.clients.jedis.args.FlushMode;
 import redis.clients.jedis.args.UnblockType;
 import redis.clients.jedis.commands.AdvancedBinaryJedisCommands;
@@ -2370,6 +2371,42 @@ public List<byte[]> sort(final byte[] key, final SortingParams sortingParameters
     return client.getBinaryMultiBulkReply();
   }
 
+  /**
+   * Pop an element from a list, push it to another list and return it
+   * @param srcKey
+   * @param dstKey
+   * @param from
+   * @param to
+   * @return
+   */
+  @Override
+  public byte[] lmove(byte[] srcKey, byte[] dstKey, ListDirection from, ListDirection to) {
+    checkIsInMultiOrPipeline();
+    client.lmove(srcKey, dstKey, from, to);
+    return client.getBinaryBulkReply();
+  }
+
+  /**
+   * Pop an element from a list, push it to another list and return it; or block until one is available
+   * @param srcKey
+   * @param dstKey
+   * @param from
+   * @param to
+   * @param timeout
+   * @return
+   */
+  @Override
+  public byte[] blmove(byte[] srcKey, byte[] dstKey, ListDirection from, ListDirection to, int timeout) {
+    checkIsInMultiOrPipeline();
+    client.blmove(srcKey, dstKey, from, to, timeout);
+    client.setTimeoutInfinite();
+    try {
+      return client.getBinaryBulkReply();
+    } finally {
+      client.rollbackTimeout();
+    }
+  }
+
   /**
    * BLPOP (and BRPOP) is a blocking list pop primitive. You can see this commands as blocking
    * versions of LPOP and RPOP able to block if the specified keys don't exist or contain empty

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

@@ -1,5 +1,6 @@
 package redis.clients.jedis;
 
+import redis.clients.jedis.args.ListDirection;
 import redis.clients.jedis.args.FlushMode;
 import redis.clients.jedis.commands.BinaryJedisClusterCommands;
 import redis.clients.jedis.commands.JedisClusterBinaryScriptingCommands;
@@ -1752,6 +1753,28 @@ public Long execute(Jedis connection) {
     }.runBinary(keys.length, keys);
   }
 
+  @Override
+  public byte[] lmove(final byte[] srcKey, final byte[] dstKey, final ListDirection from,
+      final ListDirection to) {
+    return new JedisClusterCommand<byte[]>(connectionHandler, maxAttempts) {
+      @Override
+      public byte[] execute(Jedis connection) {
+        return connection.lmove(srcKey, dstKey, from, to);
+      }
+    }.runBinary(2, srcKey, dstKey);
+  }
+
+  @Override
+  public byte[] blmove(final byte[] srcKey, final byte[] dstKey, final ListDirection from,
+      final ListDirection to, final int timeout) {
+    return new JedisClusterCommand<byte[]>(connectionHandler, maxAttempts) {
+      @Override
+      public byte[] execute(Jedis connection) {
+        return connection.blmove(srcKey, dstKey, from, to, timeout);
+      }
+    }.runBinary(2, srcKey, dstKey);
+  }
+
   @Override
   public List<byte[]> blpop(final int timeout, final byte[]... keys) {
     return new JedisClusterCommand<List<byte[]>>(connectionHandler, maxAttempts) {

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

@@ -13,6 +13,7 @@
 import javax.net.ssl.SSLParameters;
 import javax.net.ssl.SSLSocketFactory;
 
+import redis.clients.jedis.args.ListDirection;
 import redis.clients.jedis.commands.Commands;
 import redis.clients.jedis.params.*;
 import redis.clients.jedis.util.SafeEncoder;
@@ -610,6 +611,16 @@ public void sort(final String key, final SortingParams sortingParameters) {
     sort(SafeEncoder.encode(key), sortingParameters);
   }
 
+  @Override
+  public void lmove(String srcKey, String dstKey, ListDirection from, ListDirection to) {
+    lmove(SafeEncoder.encode(srcKey), SafeEncoder.encode(dstKey), from, to);
+  }
+
+  @Override
+  public void blmove(String srcKey, String dstKey, ListDirection from, ListDirection to, int timeout) {
+    blmove(SafeEncoder.encode(srcKey), SafeEncoder.encode(dstKey), from, to, timeout);
+  }
+
   @Override
   public void blpop(final String[] args) {
     blpop(SafeEncoder.encodeMany(args));

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

@@ -13,6 +13,7 @@
 import javax.net.ssl.SSLParameters;
 import javax.net.ssl.SSLSocketFactory;
 
+import redis.clients.jedis.args.ListDirection;
 import redis.clients.jedis.commands.*;
 import redis.clients.jedis.params.*;
 import redis.clients.jedis.args.UnblockType;
@@ -2027,6 +2028,27 @@ public List<String> sort(final String key, final SortingParams sortingParameters
     return client.getMultiBulkReply();
   }
 
+  @Override
+  public String lmove(final String srcKey, final String dstKey, final ListDirection from,
+      final ListDirection to) {
+    checkIsInMultiOrPipeline();
+    client.lmove(srcKey, dstKey, from, to);
+    return client.getBulkReply();
+  }
+
+  @Override
+  public String blmove(final String srcKey, final String dstKey, final ListDirection from,
+      final ListDirection to, final int timeout) {
+    checkIsInMultiOrPipeline();
+    client.blmove(srcKey, dstKey, from, to, timeout);
+    client.setTimeoutInfinite();
+    try {
+      return client.getBulkReply();
+    } finally {
+      client.rollbackTimeout();
+    }
+  }
+
   /**
    * BLPOP (and BRPOP) is a blocking list pop primitive. You can see this commands as blocking
    * versions of LPOP and RPOP able to block if the specified keys don't exist or contain empty

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

@@ -1,5 +1,6 @@
 package redis.clients.jedis;
 
+import redis.clients.jedis.args.ListDirection;
 import redis.clients.jedis.commands.JedisClusterCommands;
 import redis.clients.jedis.commands.JedisClusterScriptingCommands;
 import redis.clients.jedis.commands.MultiKeyJedisClusterCommands;
@@ -1819,6 +1820,27 @@ public Long execute(Jedis connection) {
     }.run(keys.length, keys);
   }
 
+  @Override
+  public String lmove(String srcKey, String dstKey, ListDirection from, ListDirection to) {
+    return new JedisClusterCommand<String>(connectionHandler, maxAttempts) {
+      @Override
+      public String execute(Jedis connection) {
+        return connection.lmove(srcKey, dstKey, from, to);
+      }
+    }.run(2, srcKey, dstKey);
+  }
+
+  @Override
+  public String blmove(String srcKey, String dstKey, ListDirection from, ListDirection to,
+      int timeout) {
+    return new JedisClusterCommand<String>(connectionHandler, maxAttempts) {
+      @Override
+      public String execute(Jedis connection) {
+        return connection.blmove(srcKey, dstKey, from, to, timeout);
+      }
+    }.run(2, srcKey, dstKey);
+  }
+
   @Override
   public List<String> blpop(final int timeout, final String... keys) {
     return new JedisClusterCommand<List<String>>(connectionHandler, maxAttempts) {

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

@@ -1,5 +1,6 @@
 package redis.clients.jedis;
 
+import redis.clients.jedis.args.ListDirection;
 import redis.clients.jedis.args.FlushMode;
 import redis.clients.jedis.commands.*;
 import redis.clients.jedis.params.*;
@@ -14,6 +15,34 @@ public abstract class MultiKeyPipelineBase extends PipelineBase implements
 
   protected Client client = null;
 
+  @Override
+  public Response<byte[]> lmove(byte[] srcKey, byte[] dstKey, ListDirection from,
+      ListDirection to) {
+    client.lmove(srcKey, dstKey, from, to);
+    return getResponse(BuilderFactory.BYTE_ARRAY);
+  }
+
+  @Override
+  public Response<byte[]> blmove(byte[] srcKey, byte[] dstKey, ListDirection from, ListDirection to,
+      int timeout) {
+    client.blmove(srcKey, dstKey, from, to, timeout);
+    return getResponse(BuilderFactory.BYTE_ARRAY);
+  }
+
+  @Override
+  public Response<String> lmove(String srcKey, String dstKey, ListDirection from,
+      ListDirection to) {
+    client.lmove(srcKey, dstKey, from, to);
+    return getResponse(BuilderFactory.STRING);
+  }
+
+  @Override
+  public Response<String> blmove(String srcKey, String dstKey, ListDirection from, ListDirection to,
+      int timeout) {
+    client.blmove(srcKey, dstKey, from, to, timeout);
+    return getResponse(BuilderFactory.STRING);
+  }
+
   @Override
   public Response<List<String>> brpop(String... args) {
     client.brpop(args);

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

@@ -264,7 +264,7 @@ public static enum Command implements ProtocolCommand {
     READONLY, GEOADD, GEODIST, GEOHASH, GEOPOS, GEORADIUS, GEORADIUS_RO, GEORADIUSBYMEMBER,
     GEORADIUSBYMEMBER_RO, MODULE, BITFIELD, HSTRLEN, TOUCH, SWAPDB, MEMORY, XADD, XLEN, XDEL,
     XTRIM, XRANGE, XREVRANGE, XREAD, XACK, XGROUP, XREADGROUP, XPENDING, XCLAIM, ACL, XINFO,
-    BITFIELD_RO, LPOS, SMISMEMBER, ZMSCORE, BZPOPMIN, BZPOPMAX;
+    BITFIELD_RO, LPOS, SMISMEMBER, ZMSCORE, BZPOPMIN, BZPOPMAX, BLMOVE, LMOVE;
 
     private final byte[] raw;
 

src/main/java/redis/clients/jedis/args/ListDirection.java

@@ -0,0 +1,21 @@
+package redis.clients.jedis.args;
+
+import redis.clients.jedis.util.SafeEncoder;
+
+/**
+ * Direction for {@code LMOVE} and {@code BLMOVE} command.
+ */
+public enum ListDirection implements Rawable {
+  LEFT, RIGHT;
+
+  private final byte[] raw;
+
+  ListDirection() {
+    raw = SafeEncoder.encode(this.name());
+  }
+
+  @Override
+  public byte[] getRaw() {
+    return raw;
+  }
+}

src/main/java/redis/clients/jedis/commands/Commands.java

@@ -8,6 +8,7 @@
 import redis.clients.jedis.ListPosition;
 import redis.clients.jedis.ScanParams;
 import redis.clients.jedis.SortingParams;
+import redis.clients.jedis.args.ListDirection;
 import redis.clients.jedis.args.UnblockType;
 import redis.clients.jedis.ZParams;
 import redis.clients.jedis.params.GetExParams;
@@ -274,6 +275,10 @@ default void setex(String key, int seconds, String value) {
 
   void sort(String key, SortingParams sortingParameters);
 
+  void lmove(String srcKey, String dstKey, ListDirection from, ListDirection to);
+
+  void blmove(String srcKey, String dstKey, ListDirection from, ListDirection to, int timeout);
+
   void blpop(String[] args);
 
   void sort(String key, SortingParams sortingParameters, String dstkey);

src/main/java/redis/clients/jedis/commands/MultiKeyBinaryCommands.java

@@ -7,6 +7,7 @@
 import redis.clients.jedis.SortingParams;
 import redis.clients.jedis.Tuple;
 import redis.clients.jedis.ZParams;
+import redis.clients.jedis.args.ListDirection;
 import redis.clients.jedis.params.GeoRadiusParam;
 import redis.clients.jedis.params.GeoRadiusStoreParam;
 import redis.clients.jedis.params.XReadGroupParams;
@@ -24,6 +25,10 @@ public interface MultiKeyBinaryCommands {
 
   Long exists(byte[]... keys);
 
+  byte[] lmove(byte[] srcKey, byte[] dstKey, ListDirection from, ListDirection to);
+
+  byte[] blmove(byte[] srcKey, byte[] dstKey, ListDirection from, ListDirection to, int timeout);
+
   List<byte[]> blpop(int timeout, byte[]... keys);
 
   List<byte[]> brpop(int timeout, byte[]... keys);

src/main/java/redis/clients/jedis/commands/MultiKeyBinaryJedisClusterCommands.java

@@ -9,6 +9,7 @@
 import redis.clients.jedis.SortingParams;
 import redis.clients.jedis.Tuple;
 import redis.clients.jedis.ZParams;
+import redis.clients.jedis.args.ListDirection;
 import redis.clients.jedis.params.GeoRadiusParam;
 import redis.clients.jedis.params.GeoRadiusStoreParam;
 import redis.clients.jedis.params.XReadGroupParams;
@@ -26,6 +27,10 @@ public interface MultiKeyBinaryJedisClusterCommands {
 
   Long exists(byte[]... keys);
 
+  byte[] lmove(byte[] srcKey, byte[] dstKey, ListDirection from, ListDirection to);
+
+  byte[] blmove(byte[] srcKey, byte[] dstKey, ListDirection from, ListDirection to, int timeout);
+
   List<byte[]> blpop(int timeout, byte[]... keys);
 
   List<byte[]> brpop(int timeout, byte[]... keys);

src/main/java/redis/clients/jedis/commands/MultiKeyBinaryRedisPipeline.java

@@ -7,6 +7,7 @@
 import redis.clients.jedis.SortingParams;
 import redis.clients.jedis.Tuple;
 import redis.clients.jedis.ZParams;
+import redis.clients.jedis.args.ListDirection;
 import redis.clients.jedis.params.*;
 
 import java.util.List;
@@ -24,6 +25,10 @@ public interface MultiKeyBinaryRedisPipeline {
 
   Response<Long> exists(byte[]... keys);
 
+  Response<byte[]> lmove(byte[] srcKey, byte[] dstKey, ListDirection from, ListDirection to);
+
+  Response<byte[]> blmove(byte[] srcKey, byte[] dstKey, ListDirection from, ListDirection to, int timeout);
+
   Response<List<byte[]>> blpop(byte[]... args);
 
   Response<List<byte[]>> brpop(byte[]... args);

src/main/java/redis/clients/jedis/commands/MultiKeyCommands.java

@@ -11,6 +11,7 @@
 import redis.clients.jedis.StreamEntry;
 import redis.clients.jedis.Tuple;
 import redis.clients.jedis.ZParams;
+import redis.clients.jedis.args.ListDirection;
 import redis.clients.jedis.params.GeoRadiusParam;
 import redis.clients.jedis.params.GeoRadiusStoreParam;
 import redis.clients.jedis.params.XReadGroupParams;
@@ -27,6 +28,10 @@ public interface MultiKeyCommands {
 
   Long exists(String... keys);
 
+  String lmove(String srcKey, String dstKey, ListDirection from, ListDirection to);
+
+  String blmove(String srcKey, String dstKey, ListDirection from, ListDirection to, int timeout);
+
   List<String> blpop(int timeout, String... keys);
 
   List<String> brpop(int timeout, String... keys);

src/main/java/redis/clients/jedis/commands/MultiKeyCommandsPipeline.java

@@ -9,6 +9,7 @@
 import redis.clients.jedis.StreamEntryID;
 import redis.clients.jedis.Tuple;
 import redis.clients.jedis.ZParams;
+import redis.clients.jedis.args.ListDirection;
 import redis.clients.jedis.params.*;
 
 import java.util.List;
@@ -25,6 +26,10 @@ public interface MultiKeyCommandsPipeline {
 
   Response<Long> exists(String... keys);
 
+  Response<String> lmove(String srcKey, String dstKey, ListDirection from, ListDirection to);
+
+  Response<String> blmove(String srcKey, String dstKey, ListDirection from, ListDirection to, int timeout);
+
   Response<List<String>> blpop(String... args);
 
   Response<List<String>> brpop(String... args);