From 1d55ed4c23cf66b2cfae67b2073359fa4bf97099 Mon Sep 17 00:00:00 2001 From: Nikita Koksharov Date: Wed, 3 Feb 2021 15:23:37 +0300 Subject: [PATCH] refactoring --- .../org/redisson/transaction/BaseTransactionalObject.java | 7 ++++++- .../redisson/transaction/RedissonTransactionalBucket.java | 8 +++++++- .../redisson/transaction/RedissonTransactionalMap.java | 8 +++++++- .../transaction/RedissonTransactionalMapCache.java | 8 +++++++- .../redisson/transaction/RedissonTransactionalSet.java | 8 +++++++- .../transaction/RedissonTransactionalSetCache.java | 8 +++++++- 6 files changed, 41 insertions(+), 6 deletions(-) diff --git a/redisson/src/main/java/org/redisson/transaction/BaseTransactionalObject.java b/redisson/src/main/java/org/redisson/transaction/BaseTransactionalObject.java index b879d313e..d01c2c455 100644 --- a/redisson/src/main/java/org/redisson/transaction/BaseTransactionalObject.java +++ b/redisson/src/main/java/org/redisson/transaction/BaseTransactionalObject.java @@ -15,6 +15,7 @@ */ package org.redisson.transaction; +import java.time.Instant; import java.util.Date; import java.util.concurrent.TimeUnit; @@ -34,7 +35,11 @@ public class BaseTransactionalObject { public RFuture expireAtAsync(Date timestamp) { throw new UnsupportedOperationException("expireAt method is not supported in transaction"); } - + + public RFuture expireAtAsync(Instant timestamp) { + throw new UnsupportedOperationException("expireAt method is not supported in transaction"); + } + public RFuture expireAtAsync(long timestamp) { throw new UnsupportedOperationException("expireAt method is not supported in transaction"); } diff --git a/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalBucket.java b/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalBucket.java index cbddf0f0c..dfc612104 100644 --- a/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalBucket.java +++ b/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalBucket.java @@ -29,6 +29,7 @@ import org.redisson.transaction.operation.TransactionalOperation; import org.redisson.transaction.operation.UnlinkOperation; import org.redisson.transaction.operation.bucket.*; +import java.time.Instant; import java.util.Date; import java.util.List; import java.util.concurrent.TimeUnit; @@ -80,7 +81,12 @@ public class RedissonTransactionalBucket extends RedissonBucket { public RFuture expireAtAsync(long timestamp) { throw new UnsupportedOperationException("expireAt method is not supported in transaction"); } - + + @Override + public RFuture expireAtAsync(Instant timestamp) { + throw new UnsupportedOperationException("expireAt method is not supported in transaction"); + } + @Override public RFuture clearExpireAsync() { throw new UnsupportedOperationException("clearExpire 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 07771f1ea..fa6b02f31 100644 --- a/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalMap.java +++ b/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalMap.java @@ -15,6 +15,7 @@ */ package org.redisson.transaction; +import java.time.Instant; import java.util.Collection; import java.util.Date; import java.util.List; @@ -87,7 +88,12 @@ public class RedissonTransactionalMap extends RedissonMap { public RFuture expireAtAsync(long timestamp) { throw new UnsupportedOperationException("expireAt method is not supported in transaction"); } - + + @Override + public RFuture expireAtAsync(Instant timestamp) { + throw new UnsupportedOperationException("expireAt method is not supported in transaction"); + } + @Override public RFuture clearExpireAsync() { throw new UnsupportedOperationException("clearExpire 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 042ad4710..2e1a3a168 100644 --- a/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalMapCache.java +++ b/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalMapCache.java @@ -15,6 +15,7 @@ */ package org.redisson.transaction; +import java.time.Instant; import java.util.Collection; import java.util.Date; import java.util.List; @@ -79,7 +80,12 @@ public class RedissonTransactionalMapCache extends RedissonMapCache public RFuture expireAtAsync(long timestamp) { throw new UnsupportedOperationException("expireAt method is not supported in transaction"); } - + + @Override + public RFuture expireAtAsync(Instant timestamp) { + throw new UnsupportedOperationException("expireAt method is not supported in transaction"); + } + @Override public RFuture clearExpireAsync() { throw new UnsupportedOperationException("clearExpire 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 0bcfcd107..8ac97b6a9 100644 --- a/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalSet.java +++ b/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalSet.java @@ -15,6 +15,7 @@ */ package org.redisson.transaction; +import java.time.Instant; import java.util.Collection; import java.util.Date; import java.util.List; @@ -78,7 +79,12 @@ public class RedissonTransactionalSet extends RedissonSet { public RFuture expireAtAsync(long timestamp) { throw new UnsupportedOperationException("expireAt method is not supported in transaction"); } - + + @Override + public RFuture expireAtAsync(Instant timestamp) { + throw new UnsupportedOperationException("expireAt method is not supported in transaction"); + } + @Override public RFuture clearExpireAsync() { throw new UnsupportedOperationException("clearExpire 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 ba2d047d0..8a73bd315 100644 --- a/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalSetCache.java +++ b/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalSetCache.java @@ -15,6 +15,7 @@ */ package org.redisson.transaction; +import java.time.Instant; import java.util.Collection; import java.util.Date; import java.util.List; @@ -68,7 +69,12 @@ public class RedissonTransactionalSetCache extends RedissonSetCache { public RFuture expireAtAsync(Date timestamp) { throw new UnsupportedOperationException("expireAt method is not supported in transaction"); } - + + @Override + public RFuture expireAtAsync(Instant timestamp) { + throw new UnsupportedOperationException("expireAt method is not supported in transaction"); + } + @Override public RFuture expireAtAsync(long timestamp) { throw new UnsupportedOperationException("expireAt method is not supported in transaction");