From 5f993143c60ce05db40303f09155faaa6d6bd695 Mon Sep 17 00:00:00 2001 From: seakider Date: Tue, 26 Nov 2024 22:34:48 +0800 Subject: [PATCH] Feature - Atomic class add greaterThanSet and lessThanSet method modify method name Signed-off-by: seakider --- .../java/org/redisson/RedissonAtomicDouble.java | 12 ++++++------ .../main/java/org/redisson/RedissonAtomicLong.java | 12 ++++++------ .../main/java/org/redisson/api/RAtomicDouble.java | 4 ++-- .../java/org/redisson/api/RAtomicDoubleAsync.java | 4 ++-- .../org/redisson/api/RAtomicDoubleReactive.java | 4 ++-- .../main/java/org/redisson/api/RAtomicDoubleRx.java | 4 ++-- .../src/main/java/org/redisson/api/RAtomicLong.java | 4 ++-- .../java/org/redisson/api/RAtomicLongAsync.java | 4 ++-- .../java/org/redisson/api/RAtomicLongReactive.java | 4 ++-- .../main/java/org/redisson/api/RAtomicLongRx.java | 4 ++-- .../java/org/redisson/RedissonAtomicDoubleTest.java | 13 ++++++------- .../redisson/RedissonAtomicLongReactiveTest.java | 12 ++++++------ .../java/org/redisson/RedissonAtomicLongTest.java | 12 ++++++------ 13 files changed, 46 insertions(+), 47 deletions(-) diff --git a/redisson/src/main/java/org/redisson/RedissonAtomicDouble.java b/redisson/src/main/java/org/redisson/RedissonAtomicDouble.java index 2c57d3b5a..84cbbb25c 100644 --- a/redisson/src/main/java/org/redisson/RedissonAtomicDouble.java +++ b/redisson/src/main/java/org/redisson/RedissonAtomicDouble.java @@ -172,12 +172,12 @@ public class RedissonAtomicDouble extends RedissonExpirable implements RAtomicDo } @Override - public boolean lessThanSet(double less, double value) { - return get(lessThanSetAsync(less, value)); + public boolean setIfLessThan(double less, double value) { + return get(setIfLessThanAsync(less, value)); } @Override - public RFuture lessThanSetAsync(double less, double value) { + public RFuture setIfLessThanAsync(double less, double value) { return commandExecutor.evalWriteAsync(getRawName(), StringCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN, "local currValue = redis.call('get', KEYS[1]); " + "currValue = currValue == false and 0 or tonumber(currValue);" @@ -190,12 +190,12 @@ public class RedissonAtomicDouble extends RedissonExpirable implements RAtomicDo } @Override - public boolean greaterThanSet(double greater, double value) { - return get(greaterThanSetAsync(greater, value)); + public boolean setIfGreaterThan(double greater, double value) { + return get(setIfGreaterThanAsync(greater, value)); } @Override - public RFuture greaterThanSetAsync(double greater, double value) { + public RFuture setIfGreaterThanAsync(double greater, double value) { return commandExecutor.evalWriteAsync(getRawName(), StringCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN, "local currValue = redis.call('get', KEYS[1]); " + "currValue = currValue == false and 0 or tonumber(currValue);" diff --git a/redisson/src/main/java/org/redisson/RedissonAtomicLong.java b/redisson/src/main/java/org/redisson/RedissonAtomicLong.java index 1ca3a3599..439433233 100644 --- a/redisson/src/main/java/org/redisson/RedissonAtomicLong.java +++ b/redisson/src/main/java/org/redisson/RedissonAtomicLong.java @@ -170,12 +170,12 @@ public class RedissonAtomicLong extends RedissonExpirable implements RAtomicLong } @Override - public boolean lessThanSet(long less, long value) { - return get(lessThanSetAsync(less, value)); + public boolean setIfLessThan(long less, long value) { + return get(setIfLessThanAsync(less, value)); } @Override - public RFuture lessThanSetAsync(long less, long value) { + public RFuture setIfLessThanAsync(long less, long value) { return commandExecutor.evalWriteAsync(getRawName(), StringCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN, "local currValue = redis.call('get', KEYS[1]); " + "currValue = currValue == false and 0 or tonumber(currValue);" @@ -188,12 +188,12 @@ public class RedissonAtomicLong extends RedissonExpirable implements RAtomicLong } @Override - public boolean greaterThanSet(long greater, long value) { - return get(greaterThanSetAsync(greater, value)); + public boolean setIfGreaterThan(long greater, long value) { + return get(setIfGreaterThanAsync(greater, value)); } @Override - public RFuture greaterThanSetAsync(long greater, long value) { + public RFuture setIfGreaterThanAsync(long greater, long value) { return commandExecutor.evalWriteAsync(getRawName(), StringCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN, "local currValue = redis.call('get', KEYS[1]); " + "currValue = currValue == false and 0 or tonumber(currValue);" diff --git a/redisson/src/main/java/org/redisson/api/RAtomicDouble.java b/redisson/src/main/java/org/redisson/api/RAtomicDouble.java index 79c368751..f05c136a6 100644 --- a/redisson/src/main/java/org/redisson/api/RAtomicDouble.java +++ b/redisson/src/main/java/org/redisson/api/RAtomicDouble.java @@ -115,7 +115,7 @@ public interface RAtomicDouble extends RExpirable, RAtomicDoubleAsync { * @param value newValue * @return true when the value update is successful */ - boolean lessThanSet(double less, double value); + boolean setIfLessThan(double less, double value); /** * Atomically sets the given value if current value is greater than @@ -125,7 +125,7 @@ public interface RAtomicDouble extends RExpirable, RAtomicDoubleAsync { * @param value newValue * @return true when the value update is successful */ - boolean greaterThanSet(double greater, double value); + boolean setIfGreaterThan(double greater, double value); /** * Adds object event listener diff --git a/redisson/src/main/java/org/redisson/api/RAtomicDoubleAsync.java b/redisson/src/main/java/org/redisson/api/RAtomicDoubleAsync.java index 55584a44b..50c5659af 100644 --- a/redisson/src/main/java/org/redisson/api/RAtomicDoubleAsync.java +++ b/redisson/src/main/java/org/redisson/api/RAtomicDoubleAsync.java @@ -116,7 +116,7 @@ public interface RAtomicDoubleAsync extends RExpirableAsync { * @param value newValue * @return true when the value update is successful */ - RFuture lessThanSetAsync(double less, double value); + RFuture setIfLessThanAsync(double less, double value); /** * Atomically sets the given value if current value is greater than @@ -126,7 +126,7 @@ public interface RAtomicDoubleAsync extends RExpirableAsync { * @param value newValue * @return true when the value update is successful */ - RFuture greaterThanSetAsync(double greater, double value); + RFuture setIfGreaterThanAsync(double greater, double value); /** * Adds object event listener diff --git a/redisson/src/main/java/org/redisson/api/RAtomicDoubleReactive.java b/redisson/src/main/java/org/redisson/api/RAtomicDoubleReactive.java index 9a6440a7f..c4e5f8a92 100644 --- a/redisson/src/main/java/org/redisson/api/RAtomicDoubleReactive.java +++ b/redisson/src/main/java/org/redisson/api/RAtomicDoubleReactive.java @@ -118,7 +118,7 @@ public interface RAtomicDoubleReactive extends RExpirableReactive { * @param value newValue * @return true when the value update is successful */ - Mono lessThanSet(double less, double value); + Mono setIfLessThan(double less, double value); /** * Atomically sets the given value if current value is greater than @@ -128,6 +128,6 @@ public interface RAtomicDoubleReactive extends RExpirableReactive { * @param value newValue * @return true when the value update is successful */ - Mono greaterThanSet(double greater, double value); + Mono setIfGreaterThan(double greater, double value); } diff --git a/redisson/src/main/java/org/redisson/api/RAtomicDoubleRx.java b/redisson/src/main/java/org/redisson/api/RAtomicDoubleRx.java index 2663b32f0..e549bb87c 100644 --- a/redisson/src/main/java/org/redisson/api/RAtomicDoubleRx.java +++ b/redisson/src/main/java/org/redisson/api/RAtomicDoubleRx.java @@ -119,7 +119,7 @@ public interface RAtomicDoubleRx extends RExpirableRx { * @param value newValue * @return true when the value update is successful */ - Single lessThanSet(double less, double value); + Single setIfLessThan(double less, double value); /** * Atomically sets the given value if current value is greater than @@ -129,6 +129,6 @@ public interface RAtomicDoubleRx extends RExpirableRx { * @param value newValue * @return true when the value update is successful */ - Single greaterThanSet(double greater, double value); + Single setIfGreaterThan(double greater, double value); } diff --git a/redisson/src/main/java/org/redisson/api/RAtomicLong.java b/redisson/src/main/java/org/redisson/api/RAtomicLong.java index 60e989385..34a5bb474 100644 --- a/redisson/src/main/java/org/redisson/api/RAtomicLong.java +++ b/redisson/src/main/java/org/redisson/api/RAtomicLong.java @@ -115,7 +115,7 @@ public interface RAtomicLong extends RExpirable, RAtomicLongAsync { * @param value newValue * @return true when the value update is successful */ - boolean lessThanSet(long less, long value); + boolean setIfLessThan(long less, long value); /** * Atomically sets the given value if current value is greater than @@ -125,7 +125,7 @@ public interface RAtomicLong extends RExpirable, RAtomicLongAsync { * @param value newValue * @return true when the value update is successful */ - boolean greaterThanSet(long greater, long value); + boolean setIfGreaterThan(long greater, long value); /** * Adds object event listener diff --git a/redisson/src/main/java/org/redisson/api/RAtomicLongAsync.java b/redisson/src/main/java/org/redisson/api/RAtomicLongAsync.java index 26e15ea50..427449ac3 100644 --- a/redisson/src/main/java/org/redisson/api/RAtomicLongAsync.java +++ b/redisson/src/main/java/org/redisson/api/RAtomicLongAsync.java @@ -116,7 +116,7 @@ public interface RAtomicLongAsync extends RExpirableAsync { * @param value newValue * @return true when the value update is successful */ - RFuture lessThanSetAsync(long less, long value); + RFuture setIfLessThanAsync(long less, long value); /** * Atomically sets the given value if current value is greater than @@ -126,7 +126,7 @@ public interface RAtomicLongAsync extends RExpirableAsync { * @param value newValue * @return true when the value update is successful */ - RFuture greaterThanSetAsync(long greater, long value); + RFuture setIfGreaterThanAsync(long greater, long value); /** * Adds object event listener diff --git a/redisson/src/main/java/org/redisson/api/RAtomicLongReactive.java b/redisson/src/main/java/org/redisson/api/RAtomicLongReactive.java index 0bd22b8b8..a16d5b8e0 100644 --- a/redisson/src/main/java/org/redisson/api/RAtomicLongReactive.java +++ b/redisson/src/main/java/org/redisson/api/RAtomicLongReactive.java @@ -118,7 +118,7 @@ public interface RAtomicLongReactive extends RExpirableReactive { * @param value newValue * @return true when the value update is successful */ - Mono lessThanSet(long less, long value); + Mono setIfLessThan(long less, long value); /** * Atomically sets the given value if current value is greater than @@ -128,6 +128,6 @@ public interface RAtomicLongReactive extends RExpirableReactive { * @param value newValue * @return true when the value update is successful */ - Mono greaterThanSet(long greater, long value); + Mono setIfGreaterThan(long greater, long value); } diff --git a/redisson/src/main/java/org/redisson/api/RAtomicLongRx.java b/redisson/src/main/java/org/redisson/api/RAtomicLongRx.java index 91e8d7663..d1b7f61cc 100644 --- a/redisson/src/main/java/org/redisson/api/RAtomicLongRx.java +++ b/redisson/src/main/java/org/redisson/api/RAtomicLongRx.java @@ -119,7 +119,7 @@ public interface RAtomicLongRx extends RExpirableRx { * @param value newValue * @return true when the value update is successful */ - Single lessThanSet(long less, long value); + Single setIfLessThan(long less, long value); /** * Atomically sets the given value if current value is greater than @@ -129,6 +129,6 @@ public interface RAtomicLongRx extends RExpirableRx { * @param value newValue * @return true when the value update is successful */ - Single greaterThanSet(long greater, long value); + Single setIfGreaterThan(long greater, long value); } diff --git a/redisson/src/test/java/org/redisson/RedissonAtomicDoubleTest.java b/redisson/src/test/java/org/redisson/RedissonAtomicDoubleTest.java index 0bdf013ea..e9d84506d 100644 --- a/redisson/src/test/java/org/redisson/RedissonAtomicDoubleTest.java +++ b/redisson/src/test/java/org/redisson/RedissonAtomicDoubleTest.java @@ -2,7 +2,6 @@ package org.redisson; import org.junit.jupiter.api.Test; import org.redisson.api.RAtomicDouble; -import org.redisson.api.RAtomicLong; import java.math.BigDecimal; @@ -11,24 +10,24 @@ import static org.assertj.core.api.Assertions.assertThat; public class RedissonAtomicDoubleTest extends RedisDockerTest { @Test - public void testLessThanSet() { + public void testSetIfLessThan() { RAtomicDouble al = redisson.getAtomicDouble("test"); - assertThat(al.lessThanSet(0, 1)).isFalse(); + assertThat(al.setIfLessThan(0, 1)).isFalse(); assertThat(al.get()).isEqualTo(0); al.set(12); - assertThat(al.lessThanSet(13, 1)).isTrue(); + assertThat(al.setIfLessThan(13, 1)).isTrue(); assertThat(al.get()).isEqualTo(1); } @Test - public void testGreaterThanSet() { + public void testSetIfGreaterThan() { RAtomicDouble al = redisson.getAtomicDouble("test"); - assertThat(al.lessThanSet(0, 1)).isFalse(); + assertThat(al.setIfLessThan(0, 1)).isFalse(); assertThat(al.get()).isEqualTo(0); al.set(12); - assertThat(al.greaterThanSet(11, 1)).isTrue(); + assertThat(al.setIfGreaterThan(11, 1)).isTrue(); assertThat(al.get()).isEqualTo(1); } diff --git a/redisson/src/test/java/org/redisson/RedissonAtomicLongReactiveTest.java b/redisson/src/test/java/org/redisson/RedissonAtomicLongReactiveTest.java index 2c53d9978..0ce398680 100644 --- a/redisson/src/test/java/org/redisson/RedissonAtomicLongReactiveTest.java +++ b/redisson/src/test/java/org/redisson/RedissonAtomicLongReactiveTest.java @@ -7,24 +7,24 @@ import org.redisson.api.RAtomicLongReactive; public class RedissonAtomicLongReactiveTest extends BaseReactiveTest { @Test - public void testLessThanSet() { + public void testSetIfLessThan() { RAtomicLongReactive al = redisson.getAtomicLong("test"); - Assertions.assertFalse(sync(al.lessThanSet(0, 1))); + Assertions.assertFalse(sync(al.setIfLessThan(0, 1))); Assertions.assertEquals(sync(al.get()).longValue(), 0L); sync(al.set(12)); - Assertions.assertTrue(sync(al.lessThanSet(13, 1))); + Assertions.assertTrue(sync(al.setIfLessThan(13, 1))); Assertions.assertEquals(sync(al.get()).longValue(), 1L); } @Test - public void testGreaterThanSet() { + public void testSetIfGreaterThan() { RAtomicLongReactive al = redisson.getAtomicLong("test"); - Assertions.assertFalse(sync(al.greaterThanSet(0, 1))); + Assertions.assertFalse(sync(al.setIfGreaterThan(0, 1))); Assertions.assertEquals(sync(al.get()).longValue(), 0L); sync(al.set(12)); - Assertions.assertTrue(sync(al.greaterThanSet(11, 1))); + Assertions.assertTrue(sync(al.setIfGreaterThan(11, 1))); Assertions.assertEquals(sync(al.get()).longValue(), 1L); } diff --git a/redisson/src/test/java/org/redisson/RedissonAtomicLongTest.java b/redisson/src/test/java/org/redisson/RedissonAtomicLongTest.java index d920223c5..9ebe8a86a 100644 --- a/redisson/src/test/java/org/redisson/RedissonAtomicLongTest.java +++ b/redisson/src/test/java/org/redisson/RedissonAtomicLongTest.java @@ -9,24 +9,24 @@ import static org.assertj.core.api.Assertions.assertThat; public class RedissonAtomicLongTest extends RedisDockerTest { @Test - public void testLessThanSet() { + public void testSetIfLessThan() { RAtomicLong al = redisson.getAtomicLong("test"); - assertThat(al.lessThanSet(0, 1)).isFalse(); + assertThat(al.setIfLessThan(0, 1)).isFalse(); assertThat(al.get()).isEqualTo(0); al.set(12); - assertThat(al.lessThanSet(13, 1)).isTrue(); + assertThat(al.setIfLessThan(13, 1)).isTrue(); assertThat(al.get()).isEqualTo(1); } @Test - public void testGreaterThanSet() { + public void testSetIfGreaterThan() { RAtomicLong al = redisson.getAtomicLong("test"); - assertThat(al.lessThanSet(0, 1)).isFalse(); + assertThat(al.setIfLessThan(0, 1)).isFalse(); assertThat(al.get()).isEqualTo(0); al.set(12); - assertThat(al.greaterThanSet(11, 1)).isTrue(); + assertThat(al.setIfGreaterThan(11, 1)).isTrue(); assertThat(al.get()).isEqualTo(1); }