From 4bdcafcd59e865aa3e9646b4566110e8b0aad1c7 Mon Sep 17 00:00:00 2001 From: Nikita Koksharov Date: Thu, 25 Jul 2024 09:21:48 +0300 Subject: [PATCH] refactoring --- .../connection/ClientConnectionsEntry.java | 47 ++++++++++--------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/redisson/src/main/java/org/redisson/connection/ClientConnectionsEntry.java b/redisson/src/main/java/org/redisson/connection/ClientConnectionsEntry.java index 4990cf48e..2735953ce 100644 --- a/redisson/src/main/java/org/redisson/connection/ClientConnectionsEntry.java +++ b/redisson/src/main/java/org/redisson/connection/ClientConnectionsEntry.java @@ -170,27 +170,7 @@ public class ClientConnectionsEntry { return; } - String key = null; - for (int i = 0; i < commandData.getParams().length; i++) { - Object param = commandData.getParams()[i]; - if ("STREAMS".equals(param)) { - Object k = commandData.getParams()[i+1]; - if (k instanceof byte[]) { - key = new String((byte[]) k, StandardCharsets.UTF_8); - } else { - key = (String) k; - } - break; - } - } - if (key == null) { - Object k = commandData.getParams()[0]; - if (k instanceof byte[]) { - key = new String((byte[]) k, StandardCharsets.UTF_8); - } else { - key = (String) k; - } - } + String key = getKey(commandData); MasterSlaveEntry entry = connectionManager.getEntry(key); if (entry == null) { @@ -226,6 +206,31 @@ public class ClientConnectionsEntry { }); } + private String getKey(CommandData commandData) { + String key = null; + for (int i = 0; i < commandData.getParams().length; i++) { + Object param = commandData.getParams()[i]; + if ("STREAMS".equals(param)) { + Object k = commandData.getParams()[i+1]; + if (k instanceof byte[]) { + key = new String((byte[]) k, StandardCharsets.UTF_8); + } else { + key = (String) k; + } + break; + } + } + if (key == null) { + Object k = commandData.getParams()[0]; + if (k instanceof byte[]) { + key = new String((byte[]) k, StandardCharsets.UTF_8); + } else { + key = (String) k; + } + } + return key; + } + public ConnectionsHolder getConnectionsHolder() { return connectionsHolder; }