From e6b8ceb8b3515024ca64434f36e62116cb29c9bd Mon Sep 17 00:00:00 2001 From: Nikita Koksharov Date: Thu, 4 Feb 2021 10:25:02 +0300 Subject: [PATCH] refactoring --- redisson/src/main/java/org/redisson/RedissonExpirable.java | 6 +++--- .../src/main/java/org/redisson/api/RExpirableAsync.java | 6 +++--- .../redisson/transaction/RedissonTransactionalBucket.java | 2 +- .../org/redisson/transaction/RedissonTransactionalMap.java | 2 +- .../redisson/transaction/RedissonTransactionalMapCache.java | 2 +- .../org/redisson/transaction/RedissonTransactionalSet.java | 2 +- .../redisson/transaction/RedissonTransactionalSetCache.java | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/redisson/src/main/java/org/redisson/RedissonExpirable.java b/redisson/src/main/java/org/redisson/RedissonExpirable.java index a104a88ab..3aa7e655d 100644 --- a/redisson/src/main/java/org/redisson/RedissonExpirable.java +++ b/redisson/src/main/java/org/redisson/RedissonExpirable.java @@ -60,16 +60,16 @@ abstract class RedissonExpirable extends RedissonObject implements RExpirable { @Override public RFuture expireAtAsync(long timestamp) { - return expireAtAsync(Instant.ofEpochMilli(timestamp)); + return expireAsync(Instant.ofEpochMilli(timestamp)); } @Override public boolean expire(Instant instant) { - return get(expireAtAsync(instant)); + return get(expireAsync(instant)); } @Override - public RFuture expireAtAsync(Instant instant) { + public RFuture expireAsync(Instant instant) { return commandExecutor.writeAsync(getName(), StringCodec.INSTANCE, RedisCommands.PEXPIREAT, getName(), instant.toEpochMilli()); } diff --git a/redisson/src/main/java/org/redisson/api/RExpirableAsync.java b/redisson/src/main/java/org/redisson/api/RExpirableAsync.java index 528ef9c31..7fea5e574 100644 --- a/redisson/src/main/java/org/redisson/api/RExpirableAsync.java +++ b/redisson/src/main/java/org/redisson/api/RExpirableAsync.java @@ -39,7 +39,7 @@ public interface RExpirableAsync extends RObjectAsync { RFuture expireAsync(long timeToLive, TimeUnit timeUnit); /** - * Use {@link #expireAtAsync(Instant)} instead + * Use {@link #expireAsync(Instant)} instead * * @param timestamp - expire date * @return true if the timeout was set and false if not @@ -48,7 +48,7 @@ public interface RExpirableAsync extends RObjectAsync { RFuture expireAtAsync(Date timestamp); /** - * Use {@link #expireAtAsync(Instant)} instead + * Use {@link #expireAsync(Instant)} instead * * @param timestamp - expire date in milliseconds (Unix timestamp) * @return true if the timeout was set and false if not @@ -63,7 +63,7 @@ public interface RExpirableAsync extends RObjectAsync { * @param instant - expire date * @return true if the timeout was set and false if not */ - RFuture expireAtAsync(Instant instant); + RFuture expireAsync(Instant instant); /** * Clear an expire timeout or expire date for object in async mode. diff --git a/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalBucket.java b/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalBucket.java index a269df3d6..4093bc718 100644 --- a/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalBucket.java +++ b/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalBucket.java @@ -83,7 +83,7 @@ public class RedissonTransactionalBucket extends RedissonBucket { } @Override - public RFuture expireAtAsync(Instant timestamp) { + public RFuture expireAsync(Instant timestamp) { throw new UnsupportedOperationException("expire method is not supported in transaction"); } diff --git a/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalMap.java b/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalMap.java index 3b8f6f6fd..e66403352 100644 --- a/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalMap.java +++ b/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalMap.java @@ -90,7 +90,7 @@ public class RedissonTransactionalMap extends RedissonMap { } @Override - public RFuture expireAtAsync(Instant timestamp) { + public RFuture expireAsync(Instant timestamp) { throw new UnsupportedOperationException("expire method is not supported in transaction"); } diff --git a/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalMapCache.java b/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalMapCache.java index e2c7cd6d1..53b72b728 100644 --- a/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalMapCache.java +++ b/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalMapCache.java @@ -82,7 +82,7 @@ public class RedissonTransactionalMapCache extends RedissonMapCache } @Override - public RFuture expireAtAsync(Instant timestamp) { + public RFuture expireAsync(Instant timestamp) { throw new UnsupportedOperationException("expire method is not supported in transaction"); } diff --git a/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalSet.java b/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalSet.java index 2db04d216..a8af9dad9 100644 --- a/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalSet.java +++ b/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalSet.java @@ -81,7 +81,7 @@ public class RedissonTransactionalSet extends RedissonSet { } @Override - public RFuture expireAtAsync(Instant timestamp) { + public RFuture expireAsync(Instant timestamp) { throw new UnsupportedOperationException("expire method is not supported in transaction"); } diff --git a/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalSetCache.java b/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalSetCache.java index 686f11888..c5f251c99 100644 --- a/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalSetCache.java +++ b/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalSetCache.java @@ -71,7 +71,7 @@ public class RedissonTransactionalSetCache extends RedissonSetCache { } @Override - public RFuture expireAtAsync(Instant timestamp) { + public RFuture expireAsync(Instant timestamp) { throw new UnsupportedOperationException("expire method is not supported in transaction"); }