[shardingsphere] branch master updated: Update the sub class ShardingCTLExplainBackendHandler of TextProtocolBackendHandler (#8275)

[zh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new 9dfe135  Update the sub class ShardingCTLExplainBackendHandler of TextProtocolBackendHandler (#8275)
9dfe135 is described below

commit 9dfe135e51b10e6ae7c5cfdca402494d55c873e8
Author: 深寒色的猫 <33...@users.noreply.github.com>
AuthorDate: Sun Nov 22 11:11:04 2020 +0800

    Update the sub class ShardingCTLExplainBackendHandler of TextProtocolBackendHandler (#8275)
    
    * Update ShardingCTLExplainBackendHandler's getRowData() return value to Collection type.
    
    * Update ShardingCTLExplainBackendHandlerTest with iterator
    
    * Update ShardingCTLExplainBackendHandlerTest for checkstyle
    
    Co-authored-by: Flyman <ic...@163.com>
---
 .../backend/text/sctl/explain/ShardingCTLExplainBackendHandler.java | 5 +++--
 .../text/sctl/explain/ShardingCTLExplainBackendHandlerTest.java     | 6 +++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/explain/ShardingCTLExplainBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/explain/ShardingCTLExplainBackendHandler.java
index 680ddbf..7f9278c 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/explain/ShardingCTLExplainBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/explain/ShardingCTLExplainBackendHandler.java
@@ -38,6 +38,7 @@ import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
 
 import java.sql.Types;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -91,9 +92,9 @@ public final class ShardingCTLExplainBackendHandler implements TextProtocolBacke
     }
     
     @Override
-    public List<Object> getRowData() {
+    public Collection<Object> getRowData() {
         ExecutionUnit executionUnit = executionUnits.next();
-        List<Object> row = new ArrayList<>(queryHeaders.size());
+        Collection<Object> row = new ArrayList<>(queryHeaders.size());
         row.add(executionUnit.getDataSourceName());
         row.add(executionUnit.getSqlUnit().getSql());
         return row;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/explain/ShardingCTLExplainBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/explain/ShardingCTLExplainBackendHandlerTest.java
index e05dbe1..8109131 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/explain/ShardingCTLExplainBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/explain/ShardingCTLExplainBackendHandlerTest.java
@@ -20,10 +20,12 @@ import org.junit.Test;
 import javax.sql.DataSource;
 import java.lang.reflect.Field;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.Map;
 import java.util.Properties;
 
 import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
@@ -74,6 +76,8 @@ public final class ShardingCTLExplainBackendHandlerTest {
     public void assertGetRowData() {
         handler.execute();
         assertTrue(handler.next());
-        assertThat(handler.getRowData().get(1), is("select 1"));
+        Iterator<Object> iterator = handler.getRowData().iterator();
+        assertNull(iterator.next());
+        assertThat(iterator.next(), is("select 1"));
     }
 }