Fixed - RExpirable.expire(Instant) method doesn't work for RBloomFilter, RBoundedBlockingQueue, RDelayedQueue, RLock, RIdGenerator, RMultimap, RMapCache, RPriorityQueue, RRateLimiter, RReliableTopic, RSetMultimap, RTimeSeries objects. #3660

redisson/src/main/java/org/redisson/RedissonBloomFilter.java

@@ -43,6 +43,7 @@ import org.redisson.command.CommandBatchService;
 import org.redisson.misc.Hash;
 
 import java.math.BigDecimal;
+import java.time.Instant;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -289,8 +290,8 @@ public class RedissonBloomFilter<T> extends RedissonExpirable implements RBloomF
     }
 
     @Override
-    public RFuture<Boolean> expireAtAsync(long timestamp) {
-        return expireAtAsync(timestamp, getRawName(), configName);
+    protected RFuture<Boolean> expireAtAsync(long timestamp, String... keys) {
+        return super.expireAtAsync(timestamp, getRawName(), configName);
     }
 
     @Override

redisson/src/main/java/org/redisson/RedissonBoundedBlockingQueue.java

@@ -368,8 +368,8 @@ public class RedissonBoundedBlockingQueue<V> extends RedissonQueue<V> implements
     }
 
     @Override
-    public RFuture<Boolean> expireAtAsync(long timestamp) {
-        return expireAtAsync(timestamp, getRawName(), getSemaphoreName());
+    protected RFuture<Boolean> expireAtAsync(long timestamp, String... keys) {
+        return super.expireAtAsync(timestamp, getRawName(), getSemaphoreName());
     }
 
     @Override

redisson/src/main/java/org/redisson/RedissonDelayedQueue.java

@@ -440,8 +440,8 @@ public class RedissonDelayedQueue<V> extends RedissonExpirable implements RDelay
     }
 
     @Override
-    public RFuture<Boolean> expireAtAsync(long timestamp) {
-        return expireAtAsync(timestamp, queueName, timeoutSetName);
+    protected RFuture<Boolean> expireAtAsync(long timestamp, String... keys) {
+        return super.expireAtAsync(timestamp, queueName, timeoutSetName);
     }
 
     @Override

redisson/src/main/java/org/redisson/RedissonExpirable.java

@@ -70,7 +70,7 @@ abstract class RedissonExpirable extends RedissonObject implements RExpirable {
 
     @Override
     public RFuture<Boolean> expireAsync(Instant instant) {
-        return commandExecutor.writeAsync(getRawName(), StringCodec.INSTANCE, RedisCommands.PEXPIREAT, getRawName(), instant.toEpochMilli());
+        return expireAtAsync(instant.toEpochMilli(), getRawName());
     }
 
     @Override

redisson/src/main/java/org/redisson/RedissonFairLock.java

@@ -297,8 +297,8 @@ public class RedissonFairLock extends RedissonLock implements RLock {
     }
 
     @Override
-    public RFuture<Boolean> expireAtAsync(long timestamp) {
-        return expireAtAsync(timestamp, getRawName(), threadsQueueName, timeoutSetName);
+    protected RFuture<Boolean> expireAtAsync(long timestamp, String... keys) {
+        return super.expireAtAsync(timestamp, getRawName(), threadsQueueName, timeoutSetName);
     }
 
     @Override

redisson/src/main/java/org/redisson/RedissonIdGenerator.java

@@ -160,8 +160,8 @@ public class RedissonIdGenerator extends RedissonExpirable implements RIdGenerat
     }
 
     @Override
-    public RFuture<Boolean> expireAtAsync(long timestamp) {
-        return expireAtAsync(timestamp, getRawName(), getAllocationSizeName());
+    protected RFuture<Boolean> expireAtAsync(long timestamp, String... keys) {
+        return super.expireAtAsync(timestamp, getRawName(), getAllocationSizeName());
     }
 
     @Override

redisson/src/main/java/org/redisson/RedissonListMultimap.java

@@ -15,6 +15,7 @@
  */
 package org.redisson;
 
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -239,7 +240,12 @@ public class RedissonListMultimap<K, V> extends RedissonMultimap<K, V> implement
             public RFuture<Boolean> expireAsync(long timeToLive, TimeUnit timeUnit) {
                 throw new UnsupportedOperationException("This operation is not supported for SetMultimap values Set");
             }
-            
+
+            @Override
+            public RFuture<Boolean> expireAsync(Instant instant) {
+                throw new UnsupportedOperationException("This operation is not supported for SetMultimap values Set");
+            }
+
             @Override
             public RFuture<Boolean> expireAtAsync(long timestamp) {
                 throw new UnsupportedOperationException("This operation is not supported for SetMultimap values Set");

redisson/src/main/java/org/redisson/RedissonListMultimapCache.java

@@ -15,6 +15,7 @@
  */
 package org.redisson;
 
+import java.time.Instant;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.concurrent.TimeUnit;
@@ -202,6 +203,11 @@ public class RedissonListMultimapCache<K, V> extends RedissonListMultimap<K, V>
         return baseCache.deleteAsync();
     }
 
+    @Override
+    public RFuture<Boolean> expireAsync(Instant instant) {
+        return expireAtAsync(instant.toEpochMilli());
+    }
+
     @Override
     public RFuture<Boolean> expireAsync(long timeToLive, TimeUnit timeUnit) {
         return baseCache.expireAsync(timeToLive, timeUnit);

redisson/src/main/java/org/redisson/RedissonListMultimapValues.java

@@ -15,6 +15,7 @@
  */
 package org.redisson;
 
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -71,7 +72,12 @@ public class RedissonListMultimapValues<V> extends RedissonExpirable implements
     public RFuture<Boolean> expireAsync(long timeToLive, TimeUnit timeUnit) {
         throw new UnsupportedOperationException("This operation is not supported for SetMultimap values Set");
     }
-    
+
+    @Override
+    public RFuture<Boolean> expireAsync(Instant instant) {
+        throw new UnsupportedOperationException("This operation is not supported for SetMultimap values Set");
+    }
+
     @Override
     public RFuture<Boolean> expireAtAsync(long timestamp) {
         throw new UnsupportedOperationException("This operation is not supported for SetMultimap values Set");

redisson/src/main/java/org/redisson/RedissonMapCache.java

@@ -2416,7 +2416,7 @@ public class RedissonMapCache<K, V> extends RedissonMap<K, V> implements RMapCac
     }
 
     @Override
-    public RFuture<Boolean> expireAtAsync(long timestamp) {
+    protected RFuture<Boolean> expireAtAsync(long timestamp, String... keys) {
         return commandExecutor.evalWriteAsync(getRawName(), LongCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN,
                         "local maxSize = tonumber(redis.call('hget', KEYS[5], 'max-size')); " +
                         "if maxSize ~= nil and maxSize ~= 0 then " +

redisson/src/main/java/org/redisson/RedissonMultimap.java

@@ -344,7 +344,7 @@ public abstract class RedissonMultimap<K, V> extends RedissonExpirable implement
     }
 
     @Override
-    public RFuture<Boolean> expireAtAsync(long timestamp) {
+    protected RFuture<Boolean> expireAtAsync(long timestamp, String... keys) {
         return commandExecutor.evalWriteAsync(getRawName(), LongCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN,
                 "local entries = redis.call('hgetall', KEYS[1]); " +
                 "for i, v in ipairs(entries) do " +

redisson/src/main/java/org/redisson/RedissonPermitExpirableSemaphore.java

@@ -606,8 +606,8 @@ public class RedissonPermitExpirableSemaphore extends RedissonExpirable implemen
     }
 
     @Override
-    public RFuture<Boolean> expireAtAsync(long timestamp) {
-        return expireAtAsync(timestamp, getRawName(), timeoutName);
+    protected RFuture<Boolean> expireAtAsync(long timestamp, String... keys) {
+        return super.expireAtAsync(timestamp, getRawName(), timeoutName);
     }
 
     @Override

redisson/src/main/java/org/redisson/RedissonPriorityQueue.java

@@ -429,8 +429,8 @@ public class RedissonPriorityQueue<V> extends RedissonList<V> implements RPriori
     }
 
     @Override
-    public RFuture<Boolean> expireAtAsync(long timestamp) {
-        return expireAtAsync(timestamp, getRawName(), getComparatorKeyName());
+    protected RFuture<Boolean> expireAtAsync(long timestamp, String... keys) {
+        return super.expireAtAsync(timestamp, getRawName(), getComparatorKeyName());
     }
 
     @Override

redisson/src/main/java/org/redisson/RedissonRateLimiter.java

@@ -336,8 +336,8 @@ public class RedissonRateLimiter extends RedissonExpirable implements RRateLimit
     }
 
     @Override
-    public RFuture<Boolean> expireAtAsync(long timestamp) {
-        return expireAtAsync(timestamp, getRawName(), getValueName(), getClientValueName(), getPermitsName(), getClientPermitsName());
+    protected RFuture<Boolean> expireAtAsync(long timestamp, String... keys) {
+        return super.expireAtAsync(timestamp, getRawName(), getValueName(), getClientValueName(), getPermitsName(), getClientPermitsName());
     }
 
     @Override

redisson/src/main/java/org/redisson/RedissonReliableTopic.java

@@ -282,8 +282,8 @@ public class RedissonReliableTopic extends RedissonExpirable implements RReliabl
     }
 
     @Override
-    public RFuture<Boolean> expireAtAsync(long timestamp) {
-        return expireAtAsync(timestamp, getRawName(), getSubscribersName(), getMapName(), getCounter(), getTimeout());
+    protected RFuture<Boolean> expireAtAsync(long timestamp, String... keys) {
+        return super.expireAtAsync(timestamp, getRawName(), getSubscribersName(), getMapName(), getCounter(), getTimeout());
     }
 
     @Override

redisson/src/main/java/org/redisson/RedissonSetMultimap.java

@@ -15,6 +15,7 @@
  */
 package org.redisson;
 
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -218,7 +219,12 @@ public class RedissonSetMultimap<K, V> extends RedissonMultimap<K, V> implements
             public RFuture<Boolean> expireAsync(long timeToLive, TimeUnit timeUnit) {
                 throw new UnsupportedOperationException("This operation is not supported for SetMultimap values Set");
             }
-            
+
+            @Override
+            public RFuture<Boolean> expireAsync(Instant instant) {
+                throw new UnsupportedOperationException("This operation is not supported for SetMultimap values Set");
+            }
+
             @Override
             public RFuture<Boolean> expireAtAsync(long timestamp) {
                 throw new UnsupportedOperationException("This operation is not supported for SetMultimap values Set");

redisson/src/main/java/org/redisson/RedissonSetMultimapCache.java

@@ -15,6 +15,7 @@
  */
 package org.redisson;
 
+import java.time.Instant;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.concurrent.TimeUnit;
@@ -195,6 +196,11 @@ public class RedissonSetMultimapCache<K, V> extends RedissonSetMultimap<K, V> im
         return baseCache.deleteAsync();
     }
 
+    @Override
+    public RFuture<Boolean> expireAsync(Instant instant) {
+        return expireAtAsync(instant.toEpochMilli());
+    }
+
     @Override
     public RFuture<Boolean> expireAsync(long timeToLive, TimeUnit timeUnit) {
         return baseCache.expireAsync(timeToLive, timeUnit);

redisson/src/main/java/org/redisson/RedissonSetMultimapValues.java

@@ -15,6 +15,7 @@
  */
 package org.redisson;
 
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -88,7 +89,12 @@ public class RedissonSetMultimapValues<V> extends RedissonExpirable implements R
     public RFuture<Boolean> clearExpireAsync() {
         throw new UnsupportedOperationException("This operation is not supported for SetMultimap values Set");
     }
-    
+
+    @Override
+    public RFuture<Boolean> expireAsync(Instant instant) {
+        throw new UnsupportedOperationException("This operation is not supported for SetMultimap values Set");
+    }
+
     @Override
     public RFuture<Boolean> expireAsync(long timeToLive, TimeUnit timeUnit) {
         throw new UnsupportedOperationException("This operation is not supported for SetMultimap values Set");

redisson/src/main/java/org/redisson/RedissonTimeSeries.java

@@ -563,8 +563,8 @@ public class RedissonTimeSeries<V> extends RedissonExpirable implements RTimeSer
     }
 
     @Override
-    public RFuture<Boolean> expireAtAsync(long timestamp) {
-        return expireAtAsync(timestamp, getRawName(), getTimeoutSetName());
+    protected RFuture<Boolean> expireAtAsync(long timestamp, String... keys) {
+        return super.expireAtAsync(timestamp, getRawName(), getTimeoutSetName());
     }
 
     @Override

redisson/src/test/java/org/redisson/RedissonBloomFilterTest.java

@@ -4,6 +4,8 @@ import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.redisson.api.RBloomFilter;
 
+import java.time.Instant;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class RedissonBloomFilterTest extends BaseTest {
@@ -63,6 +65,19 @@ public class RedissonBloomFilterTest extends BaseTest {
 
     }
 
+    @Test
+    public void testExpire() throws InterruptedException {
+        RBloomFilter<String> filter = redisson.getBloomFilter("filter");
+        filter.tryInit(55000000L, 0.03);
+
+        filter.add("test");
+        filter.expire(Instant.now().plusSeconds(2));
+
+        Thread.sleep(2100);
+
+        assertThat(redisson.getKeys().count()).isZero();
+    }
+
     @Test
     public void testNotInitializedOnContains() {
         Assertions.assertThrows(IllegalStateException.class, () -> {