Redis Cluster: wrapSql - add suppressed exception from JedisException as cause in the new SQLException

Author: Veirisa

driver/src/main/java/jdbc/client/impl/RedisClientBase.java

@@ -24,7 +24,7 @@ public final RedisResult execute(String sql) throws SQLException {
             Object data = execute(query);
             return RedisResultHelper.parseResult(query, data);
         } catch (JedisException e) {
-            throw new SQLException(e);
+            throw sqlWrap(e);
         }
     }
 
@@ -51,7 +51,7 @@ public final void setDatabase(String db) throws SQLException {
         try {
             setDatabase(parseSqlDbIndex(db));
         } catch (JedisException e) {
-            throw new SQLException(e);
+            throw sqlWrap(e);
         }
     }
 
@@ -63,13 +63,24 @@ public final void close() throws SQLException {
         try {
             doClose();
         } catch (JedisException e) {
-            throw new SQLException(e);
+            throw sqlWrap(e);
         }
     }
 
     protected abstract void doClose();
 
 
+    protected static SQLException sqlWrap(@NotNull JedisException e) {
+        if (e.getCause() == null) {
+            Throwable[] suppressed = e.getSuppressed();
+            if (suppressed != null && suppressed.length == 1) {
+                return new SQLException(e.getMessage(), suppressed[0]);
+            }
+        }
+        return new SQLException(e);
+    }
+
+
     protected static class SingleConnectionPoolConfig extends ConnectionPoolConfig {
         public SingleConnectionPoolConfig() {
             super();

driver/src/main/java/jdbc/client/impl/cluster/RedisJedisClusterClient.java

@@ -30,7 +30,7 @@ public RedisJedisClusterClient(@NotNull RedisJedisClusterURI uri) throws SQLExce
         try {
             jedisCluster = new JedisCluster(uri.getNodes(), uri, uri.getMaxAttempts(), new SingleConnectionPoolConfig());
         } catch (JedisException e) {
-            throw new SQLException(e);
+            throw sqlWrap(e);
         }
     }
 

driver/src/main/java/jdbc/client/impl/standalone/RedisJedisClient.java

@@ -20,15 +20,15 @@ public RedisJedisClient(@NotNull RedisJedisURI uri) throws SQLException {
             jedis = new Jedis(uri.getHostAndPort(), uri);
             jedis.connect();
         } catch (JedisException e) {
-            throw new SQLException(e);
+            throw sqlWrap(e);
         }
     }
 
     public RedisJedisClient(@NotNull Connection connection) throws SQLException {
         try {
             jedis = new Jedis(connection);
         } catch (JedisException e) {
-            throw new SQLException(e);
+            throw sqlWrap(e);
         }
     }