From bb57830f10e94fc638d20fce7bbf22517a07a77f Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 7 Jun 2023 11:33:21 +0200 Subject: [PATCH] Fix ZAddArgs.isEmpty. isEmpty now returns true if empty. Previously, the boolean returns were flipped. Closes #2588 --- .../redis/connection/RedisZSetCommands.java | 2 +- .../connection/jedis/JedisConverters.java | 2 +- .../lettuce/LettuceZSetCommands.java | 2 +- .../RedisZSetCommandsUnitTests.java | 36 +++++++++++++++++++ 4 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 src/test/java/org/springframework/data/redis/connection/RedisZSetCommandsUnitTests.java diff --git a/src/main/java/org/springframework/data/redis/connection/RedisZSetCommands.java b/src/main/java/org/springframework/data/redis/connection/RedisZSetCommands.java index 30ba7829c..fd726cdc0 100644 --- a/src/main/java/org/springframework/data/redis/connection/RedisZSetCommands.java +++ b/src/main/java/org/springframework/data/redis/connection/RedisZSetCommands.java @@ -504,7 +504,7 @@ public interface RedisZSetCommands { * @return {@literal true} if no flags set. */ public boolean isEmpty() { - return !flags.isEmpty(); + return flags.isEmpty(); } @Override diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConverters.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConverters.java index 125cd5f6e..856363380 100644 --- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConverters.java +++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConverters.java @@ -689,7 +689,7 @@ public abstract class JedisConverters extends Converters { */ static ZAddParams toZAddParams(ZAddArgs source) { - if (!source.isEmpty()) { + if (source.isEmpty()) { return new ZAddParams(); } diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceZSetCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceZSetCommands.java index 6fa4eee38..adafed841 100644 --- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceZSetCommands.java +++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceZSetCommands.java @@ -894,7 +894,7 @@ class LettuceZSetCommands implements RedisZSetCommands { io.lettuce.core.ZAddArgs target = new io.lettuce.core.ZAddArgs(); - if (!source.isEmpty()) { + if (source.isEmpty()) { return target; } diff --git a/src/test/java/org/springframework/data/redis/connection/RedisZSetCommandsUnitTests.java b/src/test/java/org/springframework/data/redis/connection/RedisZSetCommandsUnitTests.java new file mode 100644 index 000000000..9c7913a9b --- /dev/null +++ b/src/test/java/org/springframework/data/redis/connection/RedisZSetCommandsUnitTests.java @@ -0,0 +1,36 @@ +/* + * Copyright 2023 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.data.redis.connection; + +import static org.assertj.core.api.Assertions.*; + +import org.junit.jupiter.api.Test; +import org.springframework.data.redis.connection.RedisZSetCommands.ZAddArgs; + +/** + * Unit tests for {@link RedisZSetCommands}. + * + * @author Mark Paluch + */ +class RedisZSetCommandsUnitTests { + + @Test // GH-2588 + void zAddArgsShouldReportEmpty() { + + assertThat(ZAddArgs.empty().isEmpty()).isTrue(); + assertThat(ZAddArgs.ifExists().isEmpty()).isFalse(); + } +}