feat(mq, radar, block): modify generic type

src/main/java/cn/hyperchain/sdk/request/BlockRequest.java

@@ -1,17 +1,9 @@
 package cn.hyperchain.sdk.request;
 
-import cn.hyperchain.sdk.exception.RequestException;
 import cn.hyperchain.sdk.provider.ProviderManager;
-import cn.hyperchain.sdk.response.BlockResponse;
 
-public class BlockRequest<T extends BlockResponse> extends Request<T> {
-
-    public BlockRequest(String method, ProviderManager providerManager, Class<T> clazz, int... nodeIds) {
+public class BlockRequest extends Request {
+    public BlockRequest(String method, ProviderManager providerManager, Class clazz, int... nodeIds) {
         super(method, providerManager, clazz, nodeIds);
     }
-
-    @Override
-    public T send() throws RequestException {
-        return super.send();
-    }
 }

src/main/java/cn/hyperchain/sdk/request/MQRequest.java

@@ -1,19 +1,9 @@
 package cn.hyperchain.sdk.request;
 
-import cn.hyperchain.sdk.exception.RequestException;
 import cn.hyperchain.sdk.provider.ProviderManager;
-import cn.hyperchain.sdk.response.MQResponse;
-import cn.hyperchain.sdk.response.Response;
 
-public class MQRequest<T extends MQResponse> extends Request<T> {
+public class MQRequest extends Request {
     public MQRequest(String method, ProviderManager providerManager, Class clazz, int... nodeIds) {
         super(method, providerManager, clazz, nodeIds);
     }
-
-    @Override
-    public T send() throws RequestException {
-        T response = super.send();
-
-        return response;
-    }
 }

src/main/java/cn/hyperchain/sdk/request/NodeRequest.java

@@ -1,9 +1,8 @@
 package cn.hyperchain.sdk.request;
 
 import cn.hyperchain.sdk.provider.ProviderManager;
-import cn.hyperchain.sdk.response.NodeResponse;
 
-public class NodeRequest<T extends NodeResponse> extends Request {
+public class NodeRequest extends Request {
 
     public NodeRequest(String method, ProviderManager providerManager, Class clazz, int... nodeIds) {
         super(method, providerManager, clazz, nodeIds);

src/main/java/cn/hyperchain/sdk/request/RadarRequest.java

@@ -1,17 +1,10 @@
 package cn.hyperchain.sdk.request;
 
-import cn.hyperchain.sdk.exception.RequestException;
 import cn.hyperchain.sdk.provider.ProviderManager;
-import cn.hyperchain.sdk.response.Response;
 
-public class RadarRequest<T extends Response> extends Request {
+public class RadarRequest extends Request {
 
     public RadarRequest(String method, ProviderManager providerManager, Class clazz, int... nodeIds) {
         super(method, providerManager, clazz, nodeIds);
     }
-
-    @Override
-    public Response send() throws RequestException {
-        return super.send();
-    }
 }

src/main/java/cn/hyperchain/sdk/request/TxRequest.java

@@ -2,7 +2,7 @@
 
 import cn.hyperchain.sdk.exception.RequestException;
 import cn.hyperchain.sdk.provider.ProviderManager;
-import cn.hyperchain.sdk.response.TxResponse;
+import cn.hyperchain.sdk.response.tx.TxResponse;
 
 public class TxRequest<T extends TxResponse> extends Request<T> {
     public TxRequest(String method, ProviderManager providerManager, Class<T> clazz, int... nodeIds) {

src/main/java/cn/hyperchain/sdk/response/block/BlockAvgTimeResponse.java

@@ -0,0 +1,30 @@
+package cn.hyperchain.sdk.response.block;
+
+import cn.hyperchain.sdk.response.Response;
+import com.google.gson.annotations.Expose;
+
+/**
+ * this class represents block average generate time response.
+ *
+ * @author dong
+ * @date 07/05/2019
+ */
+public class BlockAvgTimeResponse extends Response {
+    @Expose
+    private String result;
+
+    public String getResult() {
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "BlockAvgTimeResponse{" +
+                "result=" + result +
+                ", jsonrpc='" + jsonrpc + '\'' +
+                ", id='" + id + '\'' +
+                ", code=" + code +
+                ", message='" + message + '\'' +
+                '}';
+    }
+}

src/main/java/cn/hyperchain/sdk/response/block/BlockCountResponse.java

@@ -0,0 +1,48 @@
+package cn.hyperchain.sdk.response.block;
+
+import cn.hyperchain.sdk.response.Response;
+import com.google.gson.annotations.Expose;
+
+/**
+ * this class represents block count response.
+ *
+ * @author dong
+ * @date 07/05/2019
+ */
+public class BlockCountResponse extends Response {
+    private class BlockCount {
+        @Expose
+        private String sumOfBlocks;
+        @Expose
+        private String startBlock;
+        @Expose
+        private String endBlock;
+
+        @Override
+        public String toString() {
+            return "BlockCount{" +
+                    "sumOfBlocks='" + sumOfBlocks + '\'' +
+                    ", startBlock='" + startBlock + '\'' +
+                    ", endBlock='" + endBlock + '\'' +
+                    '}';
+        }
+    }
+
+    @Expose
+    private BlockCount result;
+
+    public BlockCount getResult() {
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "BlockCountResponse{" +
+                "result=" + result +
+                ", jsonrpc='" + jsonrpc + '\'' +
+                ", id='" + id + '\'' +
+                ", code=" + code +
+                ", message='" + message + '\'' +
+                '}';
+    }
+}

src/main/java/cn/hyperchain/sdk/response/block/BlockNumberResponse.java

@@ -0,0 +1,30 @@
+package cn.hyperchain.sdk.response.block;
+
+import cn.hyperchain.sdk.response.Response;
+import com.google.gson.annotations.Expose;
+
+/**
+ * this class represents block number response.
+ *
+ * @author dong
+ * @date 07/05/2019
+ */
+public class BlockNumberResponse extends Response {
+    @Expose
+    private String result;
+
+    public String getResult() {
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "BlockNumberResponse{" +
+                "result=" + result +
+                ", jsonrpc='" + jsonrpc + '\'' +
+                ", id='" + id + '\'' +
+                ", code=" + code +
+                ", message='" + message + '\'' +
+                '}';
+    }
+}

src/main/java/cn/hyperchain/sdk/response/BlockResponse.java → src/main/java/cn/hyperchain/sdk/response/block/BlockResponse.java

@@ -1,5 +1,7 @@
-package cn.hyperchain.sdk.response;
+package cn.hyperchain.sdk.response.block;
 
+import cn.hyperchain.sdk.response.Response;
+import cn.hyperchain.sdk.response.tx.TxResponse;
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -69,30 +71,12 @@ public String toString() {
         }
     }
 
-    private class BlockCount {
-        @Expose
-        private String sumOfBlocks;
-        @Expose
-        private String startBlock;
-        @Expose
-        private String endBlock;
-
-        @Override
-        public String toString() {
-            return "BlockCount{" +
-                    "sumOfBlocks='" + sumOfBlocks + '\'' +
-                    ", startBlock='" + startBlock + '\'' +
-                    ", endBlock='" + endBlock + '\'' +
-                    '}';
-        }
-    }
-
     /**
      * get block list.
      *
      * @return block list
      */
-    public List<Block> getBlocks() {
+    public List<Block> getResult() {
         ArrayList<Block> blocks = new ArrayList<>();
         if (result.isJsonArray()) {
             JsonArray jsonArray = result.getAsJsonArray();
@@ -106,18 +90,6 @@ public List<Block> getBlocks() {
         return blocks;
     }
 
-    public String getAvgGenerateTime() {
-        return result.getAsString();
-    }
-
-    public String getBlockNumber() {
-        return result.getAsString();
-    }
-
-    public BlockCount getBlocksCount() {
-        return gson.fromJson(result, BlockCount.class);
-    }
-
     @Override
     public String toString() {
         return "BlockResponse{" +

src/main/java/cn/hyperchain/sdk/response/MQResponse.java → src/main/java/cn/hyperchain/sdk/response/mq/MQResponse.java

@@ -1,5 +1,6 @@
-package cn.hyperchain.sdk.response;
+package cn.hyperchain.sdk.response.mq;
 
+import cn.hyperchain.sdk.response.Response;
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -14,14 +15,15 @@ public class MQResponse extends Response {
 
     /**
      * return list of queue names.
+     *
      * @return list of queue names
      */
     public List<String> getQueueNames() {
         List<String> queue = new ArrayList<>();
         Gson gson = new Gson();
         if (result.isJsonArray()) {
             JsonArray jsonArray = result.getAsJsonArray();
-            for (JsonElement element: jsonArray) {
+            for (JsonElement element : jsonArray) {
                 String name = gson.fromJson(element, String.class);
                 queue.add(name);
             }

src/main/java/cn/hyperchain/sdk/response/NodeResponse.java → src/main/java/cn/hyperchain/sdk/response/node/NodeResponse.java

@@ -1,5 +1,6 @@
-package cn.hyperchain.sdk.response;
+package cn.hyperchain.sdk.response.node;
 
+import cn.hyperchain.sdk.response.Response;
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -56,14 +57,17 @@ public String toString() {
      * get nodes info.
      * @return node info array
      */
-    public List<Node> getNodes() {
+    public List<Node> getResult() {
         List<Node> nodes = new ArrayList<>();
         Gson gson = new Gson();
         if (result.isJsonArray()) {
             JsonArray jsonArray = result.getAsJsonArray();
             for (JsonElement jsonElement : jsonArray) {
                 nodes.add(gson.fromJson(jsonElement, Node.class));
             }
+        } else {
+            Node node = gson.fromJson(result, Node.class);
+            nodes.add(node);
         }
         return nodes;
     }

src/main/java/cn/hyperchain/sdk/response/RadarResponse.java → src/main/java/cn/hyperchain/sdk/response/radar/RadarResponse.java

@@ -1,4 +1,6 @@
-package cn.hyperchain.sdk.response;
+package cn.hyperchain.sdk.response.radar;
+
+import cn.hyperchain.sdk.response.Response;
 
 public class RadarResponse extends Response {
 

src/main/java/cn/hyperchain/sdk/response/TxResponse.java → src/main/java/cn/hyperchain/sdk/response/tx/TxResponse.java

@@ -1,5 +1,6 @@
-package cn.hyperchain.sdk.response;
+package cn.hyperchain.sdk.response.tx;
 
+import cn.hyperchain.sdk.response.Response;
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;