From 986a026703655710e3a90c5f6ca5575a9cacd54c Mon Sep 17 00:00:00 2001
From: taoyameng <54356452+taoyameng@users.noreply.github.com>
Date: Mon, 13 Feb 2023 16:31:24 +0800
Subject: [PATCH] [hotfix-#1497][chunjun-connector-http]Solve the problem that
 http-x plug-in cannot be used in sql mode (#1500)

Co-authored-by: 443321070@qq.com <taotao0226.?>
(cherry picked from commit d65793b4286a32986587e4abb3effd4089e6045a)
---
 .../connector/http/converter/HttpRowConverter.java   |  9 +++------
 .../http/table/HttpDynamicTableFactory.java          |  4 ++++
 .../chunjun/connector/http/table/HttpOptions.java    | 12 ++++++++++++
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/converter/HttpRowConverter.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/converter/HttpRowConverter.java
index 8994c61b78..9aa8331813 100644
--- a/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/converter/HttpRowConverter.java
+++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/converter/HttpRowConverter.java
@@ -18,12 +18,10 @@
 
 package com.dtstack.chunjun.connector.http.converter;
 
-import com.dtstack.chunjun.connector.http.client.DefaultRestHandler;
 import com.dtstack.chunjun.connector.http.common.HttpRestConfig;
 import com.dtstack.chunjun.converter.AbstractRowConverter;
 import com.dtstack.chunjun.converter.IDeserializationConverter;
 import com.dtstack.chunjun.converter.ISerializationConverter;
-import com.dtstack.chunjun.util.GsonUtil;
 import com.dtstack.chunjun.util.MapUtil;
 
 import org.apache.flink.table.data.DecimalData;
@@ -45,7 +43,8 @@
 import java.util.Map;
 
 /** Base class for all converters that convert between restapi body and Flink internal object. */
-public class HttpRowConverter extends AbstractRowConverter<String, RowData, RowData, LogicalType> {
+public class HttpRowConverter
+        extends AbstractRowConverter<Map<String, Object>, RowData, RowData, LogicalType> {
 
     private HttpRestConfig httpRestConfig;
 
@@ -69,9 +68,7 @@ public HttpRowConverter(RowType rowType) {
     }
 
     @Override
-    public RowData toInternal(String input) throws Exception {
-        Map<String, Object> result =
-                DefaultRestHandler.gson.fromJson(input, GsonUtil.gsonMapTypeToken);
+    public RowData toInternal(Map<String, Object> result) throws Exception {
         GenericRowData genericRowData = new GenericRowData(rowType.getFieldCount());
         List<String> columns = rowType.getFieldNames();
         for (int pos = 0; pos < columns.size(); pos++) {
diff --git a/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/table/HttpDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/table/HttpDynamicTableFactory.java
index a8752280f2..7e17812605 100644
--- a/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/table/HttpDynamicTableFactory.java
+++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/table/HttpDynamicTableFactory.java
@@ -72,6 +72,8 @@ public Set<ConfigOption<?>> optionalOptions() {
         options.add(HttpOptions.INTERVALTIME);
         options.add(HttpOptions.COLUMN);
         options.add(HttpOptions.DELAY);
+        options.add(HttpOptions.DATA_SUBJECT);
+        options.add(HttpOptions.CYCLES);
 
         return options;
     }
@@ -142,6 +144,8 @@ private HttpRestConfig getRestapiConf(ReadableConfig config) {
         httpRestConfig.setUrl(config.get(HttpOptions.URL));
         httpRestConfig.setDecode(config.get(HttpOptions.DECODE));
         httpRestConfig.setRequestMode(config.get(HttpOptions.METHOD));
+        httpRestConfig.setDataSubject(config.get(HttpOptions.DATA_SUBJECT));
+        httpRestConfig.setCycles(config.get(HttpOptions.CYCLES));
         httpRestConfig.setParam(
                 gson.fromJson(
                         config.get(HttpOptions.PARAMS),
diff --git a/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/table/HttpOptions.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/table/HttpOptions.java
index 81ea37ba0f..0bfaf10eb5 100644
--- a/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/table/HttpOptions.java
+++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/table/HttpOptions.java
@@ -64,4 +64,16 @@ public class HttpOptions {
 
     public static final ConfigOption<Integer> DELAY =
             ConfigOptions.key("delay").intType().defaultValue(30).withDescription("request delay");
+
+    public static final ConfigOption<String> DATA_SUBJECT =
+            ConfigOptions.key("dataSubject")
+                    .stringType()
+                    .defaultValue("${data}")
+                    .withDescription("response data subject");
+
+    public static final ConfigOption<Long> CYCLES =
+            ConfigOptions.key("cycles")
+                    .longType()
+                    .defaultValue(1L)
+                    .withDescription("request cycle");
 }