This is an automated email from the ASF dual-hosted git repository. jensdeppe pushed a commit to branch support/1.15 in repository https://gitbox.apache.org/repos/asf/geode.git
commit d1d5e1e7c09f89a81cdaed6d4478d2f8cd121a41 Author: Donal Evans <doev...@vmware.com> AuthorDate: Thu Jan 20 08:53:14 2022 -0800 GEODE-9977: Remove defunct RedisCommandSupportLevel.INTERNAL type (#7283) Authored-by: Donal Evans <doev...@vmware.com> (cherry picked from commit b349cb8b33fb0c93c0a3ea6a2f6c32bd33b51319) --- .../geode/redis/internal/commands/RedisCommandSupportLevel.java | 3 +-- .../org/apache/geode/redis/internal/commands/RedisCommandType.java | 6 ------ .../internal/commands/executor/server/COMMANDCommandExecutor.java | 3 +-- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/RedisCommandSupportLevel.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/RedisCommandSupportLevel.java index a8f6796..15caf12 100644 --- a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/RedisCommandSupportLevel.java +++ b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/RedisCommandSupportLevel.java @@ -19,6 +19,5 @@ package org.apache.geode.redis.internal.commands; public enum RedisCommandSupportLevel { SUPPORTED, UNSUPPORTED, - UNKNOWN, - INTERNAL + UNKNOWN } diff --git a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/RedisCommandType.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/RedisCommandType.java index acf335f..3a461de 100755 --- a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/RedisCommandType.java +++ b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/RedisCommandType.java @@ -16,7 +16,6 @@ package org.apache.geode.redis.internal.commands; import static org.apache.geode.redis.internal.RedisConstants.ERROR_SYNTAX; -import static org.apache.geode.redis.internal.commands.RedisCommandSupportLevel.INTERNAL; import static org.apache.geode.redis.internal.commands.RedisCommandSupportLevel.SUPPORTED; import static org.apache.geode.redis.internal.commands.RedisCommandSupportLevel.UNSUPPORTED; import static org.apache.geode.redis.internal.commands.RedisCommandType.Flag.ADMIN; @@ -447,11 +446,6 @@ public enum RedisCommandType { return supportLevel == UNSUPPORTED; } - - public boolean isInternal() { - return supportLevel == INTERNAL; - } - public boolean isUnknown() { return supportLevel == RedisCommandSupportLevel.UNKNOWN; } diff --git a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/executor/server/COMMANDCommandExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/executor/server/COMMANDCommandExecutor.java index 1557d92..b5950a8 100644 --- a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/executor/server/COMMANDCommandExecutor.java +++ b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/executor/server/COMMANDCommandExecutor.java @@ -62,8 +62,7 @@ public class COMMANDCommandExecutor implements CommandExecutor { List<Object> response = new ArrayList<>(); for (RedisCommandType type : RedisCommandType.values()) { - if (type.isInternal() - || type.isUnknown() + if (type.isUnknown() || (type.isUnsupported() && !context.allowUnsupportedCommands()) || type == RedisCommandType.QUIT) { continue;