diff --git a/redisson/src/main/java/org/redisson/RedissonExpirable.java b/redisson/src/main/java/org/redisson/RedissonExpirable.java
index bafcca539..a104a88ab 100644
--- a/redisson/src/main/java/org/redisson/RedissonExpirable.java
+++ b/redisson/src/main/java/org/redisson/RedissonExpirable.java
@@ -64,7 +64,7 @@ abstract class RedissonExpirable extends RedissonObject implements RExpirable {
}
@Override
- public boolean expireAt(Instant instant) {
+ public boolean expire(Instant instant) {
return get(expireAtAsync(instant));
}
diff --git a/redisson/src/main/java/org/redisson/api/RExpirable.java b/redisson/src/main/java/org/redisson/api/RExpirable.java
index e6f871026..20c548c72 100644
--- a/redisson/src/main/java/org/redisson/api/RExpirable.java
+++ b/redisson/src/main/java/org/redisson/api/RExpirable.java
@@ -39,7 +39,7 @@ public interface RExpirable extends RObject, RExpirableAsync {
boolean expire(long timeToLive, TimeUnit timeUnit);
/**
- * Use {@link #expireAt(Instant)} instead
+ * Use {@link #expire(Instant)} instead
*
* @param timestamp - expire date in milliseconds (Unix timestamp)
* @return true
if the timeout was set and false
if not
@@ -48,7 +48,7 @@ public interface RExpirable extends RObject, RExpirableAsync {
boolean expireAt(long timestamp);
/**
- * Use {@link #expireAt(Instant)} instead
+ * Use {@link #expire(Instant)} instead
*
* @param timestamp - expire date
* @return true
if the timeout was set and false
if not
@@ -63,7 +63,7 @@ public interface RExpirable extends RObject, RExpirableAsync {
* @param instant - expire date
* @return true
if the timeout was set and false
if not
*/
- boolean expireAt(Instant instant);
+ boolean expire(Instant instant);
/**
* Clear an expire timeout or expire date for object.
diff --git a/redisson/src/main/java/org/redisson/transaction/BaseTransactionalObject.java b/redisson/src/main/java/org/redisson/transaction/BaseTransactionalObject.java
index d01c2c455..2d789fcba 100644
--- a/redisson/src/main/java/org/redisson/transaction/BaseTransactionalObject.java
+++ b/redisson/src/main/java/org/redisson/transaction/BaseTransactionalObject.java
@@ -33,15 +33,15 @@ public class BaseTransactionalObject {
}
public RFuture expireAtAsync(Date timestamp) {
- throw new UnsupportedOperationException("expireAt method is not supported in transaction");
+ throw new UnsupportedOperationException("expire method is not supported in transaction");
}
public RFuture expireAtAsync(Instant timestamp) {
- throw new UnsupportedOperationException("expireAt method is not supported in transaction");
+ throw new UnsupportedOperationException("expire method is not supported in transaction");
}
public RFuture expireAtAsync(long timestamp) {
- throw new UnsupportedOperationException("expireAt method is not supported in transaction");
+ throw new UnsupportedOperationException("expire method is not supported in transaction");
}
public RFuture clearExpireAsync() {
diff --git a/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalBucket.java b/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalBucket.java
index dfc612104..a269df3d6 100644
--- a/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalBucket.java
+++ b/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalBucket.java
@@ -74,17 +74,17 @@ public class RedissonTransactionalBucket extends RedissonBucket {
@Override
public RFuture expireAtAsync(Date timestamp) {
- throw new UnsupportedOperationException("expireAt method is not supported in transaction");
+ throw new UnsupportedOperationException("expire method is not supported in transaction");
}
@Override
public RFuture expireAtAsync(long timestamp) {
- throw new UnsupportedOperationException("expireAt method is not supported in transaction");
+ throw new UnsupportedOperationException("expire method is not supported in transaction");
}
@Override
public RFuture expireAtAsync(Instant timestamp) {
- throw new UnsupportedOperationException("expireAt method is not supported in transaction");
+ throw new UnsupportedOperationException("expire method is not supported in transaction");
}
@Override
diff --git a/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalMap.java b/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalMap.java
index fa6b02f31..3b8f6f6fd 100644
--- a/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalMap.java
+++ b/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalMap.java
@@ -81,17 +81,17 @@ public class RedissonTransactionalMap extends RedissonMap {
@Override
public RFuture expireAtAsync(Date timestamp) {
- throw new UnsupportedOperationException("expireAt method is not supported in transaction");
+ throw new UnsupportedOperationException("expire method is not supported in transaction");
}
@Override
public RFuture expireAtAsync(long timestamp) {
- throw new UnsupportedOperationException("expireAt method is not supported in transaction");
+ throw new UnsupportedOperationException("expire method is not supported in transaction");
}
@Override
public RFuture expireAtAsync(Instant timestamp) {
- throw new UnsupportedOperationException("expireAt method is not supported in transaction");
+ throw new UnsupportedOperationException("expire method is not supported in transaction");
}
@Override
diff --git a/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalMapCache.java b/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalMapCache.java
index 2e1a3a168..e2c7cd6d1 100644
--- a/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalMapCache.java
+++ b/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalMapCache.java
@@ -73,17 +73,17 @@ public class RedissonTransactionalMapCache extends RedissonMapCache
@Override
public RFuture expireAtAsync(Date timestamp) {
- throw new UnsupportedOperationException("expireAt method is not supported in transaction");
+ throw new UnsupportedOperationException("expire method is not supported in transaction");
}
@Override
public RFuture expireAtAsync(long timestamp) {
- throw new UnsupportedOperationException("expireAt method is not supported in transaction");
+ throw new UnsupportedOperationException("expire method is not supported in transaction");
}
@Override
public RFuture expireAtAsync(Instant timestamp) {
- throw new UnsupportedOperationException("expireAt method is not supported in transaction");
+ throw new UnsupportedOperationException("expire method is not supported in transaction");
}
@Override
diff --git a/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalSet.java b/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalSet.java
index 8ac97b6a9..2db04d216 100644
--- a/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalSet.java
+++ b/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalSet.java
@@ -72,17 +72,17 @@ public class RedissonTransactionalSet extends RedissonSet {
@Override
public RFuture expireAtAsync(Date timestamp) {
- throw new UnsupportedOperationException("expireAt method is not supported in transaction");
+ throw new UnsupportedOperationException("expire method is not supported in transaction");
}
@Override
public RFuture expireAtAsync(long timestamp) {
- throw new UnsupportedOperationException("expireAt method is not supported in transaction");
+ throw new UnsupportedOperationException("expire method is not supported in transaction");
}
@Override
public RFuture expireAtAsync(Instant timestamp) {
- throw new UnsupportedOperationException("expireAt method is not supported in transaction");
+ throw new UnsupportedOperationException("expire method is not supported in transaction");
}
@Override
diff --git a/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalSetCache.java b/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalSetCache.java
index 8a73bd315..686f11888 100644
--- a/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalSetCache.java
+++ b/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalSetCache.java
@@ -67,17 +67,17 @@ public class RedissonTransactionalSetCache extends RedissonSetCache {
@Override
public RFuture expireAtAsync(Date timestamp) {
- throw new UnsupportedOperationException("expireAt method is not supported in transaction");
+ throw new UnsupportedOperationException("expire method is not supported in transaction");
}
@Override
public RFuture expireAtAsync(Instant timestamp) {
- throw new UnsupportedOperationException("expireAt method is not supported in transaction");
+ throw new UnsupportedOperationException("expire method is not supported in transaction");
}
@Override
public RFuture expireAtAsync(long timestamp) {
- throw new UnsupportedOperationException("expireAt method is not supported in transaction");
+ throw new UnsupportedOperationException("expire method is not supported in transaction");
}
@Override