Merge pull request #6016 from microsoft/fix-redis

fix errors in redis explorer.

Author: Flanker32

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-redis/src/main/java/com/microsoft/azure/toolkit/intellij/redis/explorer/RedisCacheExplorer.java

@@ -28,6 +28,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.function.Function;
 
 import static redis.clients.jedis.ScanParams.SCAN_POINTER_START;
 
@@ -37,7 +38,6 @@ public class RedisCacheExplorer extends BaseEditor {
     public static final String ID = "com.microsoft.intellij.helpers.rediscache.RedisCacheExplorer";
     public static final String INSIGHT_NAME = "AzurePlugin.IntelliJ.Editor.RedisCacheExplorer";
     private final RedisCache redis;
-    private Jedis jedis;
 
     private String currentCursor;
     private String lastChosenKey;
@@ -96,7 +96,7 @@ public RedisCacheExplorer(RedisCache redis, @Nonnull final VirtualFile virtualFi
         tblInnerValue.getTableHeader().setFont(valueFont);
         txtStringValue.setFont(valueFont);
         final DefaultTableCellRenderer cellRenderer = (DefaultTableCellRenderer) tblInnerValue.getTableHeader()
-                .getDefaultRenderer();
+            .getDefaultRenderer();
         cellRenderer.setHorizontalAlignment(JLabel.LEFT);
         pnlInnerValue.setBackground(lstKey.getBackground());
 
@@ -119,7 +119,7 @@ public RedisCacheExplorer(RedisCache redis, @Nonnull final VirtualFile virtualFi
             RedisCacheExplorer.this.setWidgetEnableStatus(false);
             lastChosenKey = selectedKey;
             manager.runOnPooledThread(() -> {
-                final Pair<String, ArrayList<String[]>> data = getValueByKey(this.jedis, selectedKey);
+                final Pair<String, ArrayList<String[]>> data = doWithRedis(jedis -> getValueByKey(jedis, selectedKey));
                 manager.runLater(() -> RedisCacheExplorer.this.showContent(data));
             });
         });
@@ -129,7 +129,8 @@ public RedisCacheExplorer(RedisCache redis, @Nonnull final VirtualFile virtualFi
         btnScanMore.addActionListener(event -> {
             RedisCacheExplorer.this.setWidgetEnableStatus(false);
             manager.runOnPooledThread(() -> {
-                final ScanResult<String> r = this.jedis.scan(currentCursor, new ScanParams().match(txtKeyPattern.getText()).count(DEFAULT_KEY_COUNT));
+                final ScanResult<String> r = doWithRedis(jedis -> jedis.scan(currentCursor, new ScanParams()
+                    .match(txtKeyPattern.getText()).count(DEFAULT_KEY_COUNT)));
                 manager.runLater(() -> RedisCacheExplorer.this.showScanResult(r));
             });
         });
@@ -146,12 +147,17 @@ public RedisCacheExplorer(RedisCache redis, @Nonnull final VirtualFile virtualFi
         });
 
         manager.runOnPooledThread(() -> {
-            this.jedis = this.redis.getJedisPool().getResource();
-            final int num = getDbNumber(this.jedis);
+            final int num = doWithRedis(RedisCacheExplorer::getDbNumber);
             AzureTaskManager.getInstance().runLater(() -> this.renderDbCombo(num));
         });
     }
 
+    private <T> T doWithRedis(Function<Jedis, T> func) {
+        try (final Jedis jedis = this.redis.getJedisPool().getResource()) {
+            return func.apply(jedis);
+        }
+    }
+
     @Nonnull
     @Override
     public JComponent getComponent() {
@@ -165,9 +171,6 @@ public String getName() {
     }
 
     public void dispose() {
-        if (Objects.nonNull(this.jedis)) {
-            this.jedis.close();
-        }
     }
 
     public void renderDbCombo(int num) {
@@ -248,8 +251,10 @@ public void getKeyFail() {
     private void onDataBaseSelect() {
         final AzureTaskManager manager = AzureTaskManager.getInstance();
         manager.runOnPooledThread(() -> {
-            this.jedis.select(cbDatabase.getSelectedIndex());
-            final ScanResult<String> r = this.jedis.scan(SCAN_POINTER_START, new ScanParams().match(DEFAULT_SCAN_PATTERN).count(DEFAULT_KEY_COUNT));
+            final ScanResult<String> r = doWithRedis(jedis -> {
+                jedis.select(cbDatabase.getSelectedIndex());
+                return jedis.scan(SCAN_POINTER_START, new ScanParams().match(DEFAULT_SCAN_PATTERN).count(DEFAULT_KEY_COUNT));
+            });
             manager.runLater(() -> RedisCacheExplorer.this.showScanResult(r));
         });
     }
@@ -285,23 +290,23 @@ private void onBtnSearchClick() {
         if (Objects.equals(actionType, ACTION_GET)) {
             final AzureTaskManager manager = AzureTaskManager.getInstance();
             manager.runOnPooledThread(() -> {
-                final boolean isExist = this.jedis.exists(key);
-                final Pair<String, ArrayList<String[]>> result = isExist ? getValueByKey(this.jedis, key) : null;
+                final Pair<String, ArrayList<String[]>> result = doWithRedis(jedis ->
+                    jedis.exists(key) ? getValueByKey(jedis, key) : Pair.of("", new ArrayList<>()));
                 this.updateKeyList();
                 this.showContent(result);
             });
         } else if (Objects.equals(actionType, ACTION_SCAN)) {
             final AzureTaskManager manager = AzureTaskManager.getInstance();
             manager.runOnPooledThread(() -> {
-                final ScanResult<String> r = this.jedis.scan(SCAN_POINTER_START, new ScanParams().match(key).count(DEFAULT_KEY_COUNT));
+                final ScanResult<String> r = doWithRedis(jedis -> jedis.scan(SCAN_POINTER_START, new ScanParams().match(key).count(DEFAULT_KEY_COUNT)));
                 manager.runLater(() -> RedisCacheExplorer.this.showScanResult(r));
             });
             currentCursor = SCAN_POINTER_START;
         }
         lastChosenKey = "";
     }
 
-    private class ReadOnlyTableModel extends DefaultTableModel {
+    private static class ReadOnlyTableModel extends DefaultTableModel {
         ReadOnlyTableModel(Object[][] data, String[] columnNames) {
             super(data, columnNames);
         }
@@ -355,7 +360,7 @@ private static Pair<String, ArrayList<String[]>> getValueByKey(Jedis jedis, Stri
             case "LIST":
                 final long listLength = jedis.llen(key);
                 final List<String> listVal = jedis.lrange(key, DEFAULT_RANGE_START,
-                        listLength < DEFAULT_VAL_COUNT ? listLength : DEFAULT_VAL_COUNT);
+                    listLength < DEFAULT_VAL_COUNT ? listLength : DEFAULT_VAL_COUNT);
                 for (int i = 0; i < listVal.size(); i++) {
                     columnData.add(new String[]{String.valueOf(i + 1), listVal.get(i)});
                 }
@@ -369,7 +374,7 @@ private static Pair<String, ArrayList<String[]>> getValueByKey(Jedis jedis, Stri
             case "ZSET":
                 final long zsetLength = jedis.zcard(key);
                 final Set<Tuple> zsetVal = jedis.zrangeWithScores(key, DEFAULT_RANGE_START,
-                        zsetLength < DEFAULT_VAL_COUNT ? zsetLength : DEFAULT_VAL_COUNT);
+                    zsetLength < DEFAULT_VAL_COUNT ? zsetLength : DEFAULT_VAL_COUNT);
                 for (final Tuple tuple : zsetVal) {
                     columnData.add(new String[]{String.valueOf(tuple.getScore()), tuple.getElement()});
                 }

Utils/azuretools-core/src/com/microsoft/azuretools/core/mvp/ui/rediscache/RedisScanResult.java

@@ -17,7 +17,7 @@ public class RedisScanResult {
 
     public RedisScanResult(ScanResult<String> result) {
         this.keys = result.getResult();
-        this.nextCursor = result.getStringCursor();
+        this.nextCursor = result.getCursor();
     }
 
     public String getNextCursor() {

Utils/pom.xml

@@ -266,7 +266,7 @@
             <dependency>
                 <groupId>redis.clients</groupId>
                 <artifactId>jedis</artifactId>
-                <version>2.10.2</version>
+                <version>3.6.3</version>
             </dependency>
             <dependency>
                 <groupId>io.reactivex</groupId>