You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/08/17 03:22:38 UTC

[incubator-linkis] branch dev-1.2.0 updated: [Feature-2819]Optimize:datasource support query info api with published version (#2821)

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

peacewong pushed a commit to branch dev-1.2.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git


The following commit(s) were added to refs/heads/dev-1.2.0 by this push:
     new e20be74de [Feature-2819]Optimize:datasource support query info api  with published version (#2821)
e20be74de is described below

commit e20be74de30547f809f97b4587ff1545a0accedb
Author: Casion <ca...@gmail.com>
AuthorDate: Wed Aug 17 11:22:33 2022 +0800

    [Feature-2819]Optimize:datasource support query info api  with published version (#2821)
    
    * optimize:datasource support query info api  with published version parameters
---
 .../datasource/client/DataSourceRemoteClient.scala |  7 ++
 .../client/impl/LinkisDataSourceRemoteClient.scala | 10 ++-
 .../GetInfoPublishedByDataSourceNameAction.scala   | 77 +++++++++++++++++++++
 .../GetInfoPublishedByDataSourceNameResult.scala   | 35 ++++++++++
 .../datasource/client/TestDataSourceClient.scala   | 33 +++++++--
 .../core/restful/DataSourceCoreRestfulApi.java     | 33 +++++++++
 .../core/service/DataSourceInfoService.java        |  9 +++
 .../service/impl/DataSourceInfoServiceImpl.java    | 80 +++++++++-------------
 8 files changed, 228 insertions(+), 56 deletions(-)

diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/DataSourceRemoteClient.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/DataSourceRemoteClient.scala
index 22a67ebf4..7a9cd6f67 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/DataSourceRemoteClient.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/DataSourceRemoteClient.scala
@@ -21,16 +21,23 @@ import org.apache.linkis.datasource.client.request._
 import org.apache.linkis.datasource.client.response._
 
 trait DataSourceRemoteClient extends RemoteClient {
+
   def getAllDataSourceTypes(action: GetAllDataSourceTypesAction): GetAllDataSourceTypesResult
 
   def queryDataSourceEnv(action: QueryDataSourceEnvAction): QueryDataSourceEnvResult
+
   def getInfoByDataSourceId(action: GetInfoByDataSourceIdAction): GetInfoByDataSourceIdResult
+
   def getInfoByDataSourceName(action: GetInfoByDataSourceNameAction): GetInfoByDataSourceNameResult
 
+  def getInfoPublishedByDataSourceName(action: GetInfoPublishedByDataSourceNameAction): GetInfoPublishedByDataSourceNameResult
+
   def queryDataSource(action: QueryDataSourceAction): QueryDataSourceResult
 
   def getConnectParams(action: GetConnectParamsByDataSourceIdAction): GetConnectParamsByDataSourceIdResult
 
+  def getConnectParamsByName(action: GetConnectParamsByDataSourceNameAction): GetConnectParamsByDataSourceNameResult
+
   def createDataSource(action: CreateDataSourceAction): CreateDataSourceResult
 
   def getDataSourceTestConnect(action: DataSourceTestConnectAction): DataSourceTestConnectResult
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/impl/LinkisDataSourceRemoteClient.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/impl/LinkisDataSourceRemoteClient.scala
index eeaf48f79..7e18671c7 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/impl/LinkisDataSourceRemoteClient.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/impl/LinkisDataSourceRemoteClient.scala
@@ -17,6 +17,8 @@
 
 package org.apache.linkis.datasource.client.impl
 
+import java.util.concurrent.TimeUnit
+
 import org.apache.commons.lang3.StringUtils
 import org.apache.linkis.common.conf.Configuration
 import org.apache.linkis.datasource.client.config.DatasourceClientConfig._
@@ -29,8 +31,6 @@ import org.apache.linkis.httpclient.dws.DWSHttpClient
 import org.apache.linkis.httpclient.dws.authentication.TokenAuthenticationStrategy
 import org.apache.linkis.httpclient.dws.config.{DWSClientConfig, DWSClientConfigBuilder}
 
-import java.util.concurrent.TimeUnit
-
 
 class LinkisDataSourceRemoteClient(clientConfig: DWSClientConfig, clientName: String) extends AbstractRemoteClient with DataSourceRemoteClient {
   def this() = this(null, null)
@@ -41,7 +41,7 @@ class LinkisDataSourceRemoteClient(clientConfig: DWSClientConfig, clientName: St
 
   def createClientConfig(): DWSClientConfig = {
     val serverUrl = Configuration.getGateWayURL()
-    if(StringUtils.isEmpty(serverUrl)) throw new DataSourceClientBuilderException("serverUrl cannot be null.")
+    if (StringUtils.isEmpty(serverUrl)) throw new DataSourceClientBuilderException("serverUrl cannot be null.")
 
     val maxConnection: Int = CONNECTION_MAX_SIZE.getValue
     val connectTimeout: Int = CONNECTION_TIMEOUT.getValue
@@ -74,10 +74,14 @@ class LinkisDataSourceRemoteClient(clientConfig: DWSClientConfig, clientName: St
 
   override def getInfoByDataSourceName(action: GetInfoByDataSourceNameAction): GetInfoByDataSourceNameResult = execute(action).asInstanceOf[GetInfoByDataSourceNameResult]
 
+  override def getInfoPublishedByDataSourceName(action: GetInfoPublishedByDataSourceNameAction): GetInfoPublishedByDataSourceNameResult = execute(action).asInstanceOf[GetInfoPublishedByDataSourceNameResult]
+
   override def queryDataSource(action: QueryDataSourceAction): QueryDataSourceResult = execute(action).asInstanceOf[QueryDataSourceResult]
 
   override def getConnectParams(action: GetConnectParamsByDataSourceIdAction): GetConnectParamsByDataSourceIdResult = execute(action).asInstanceOf[GetConnectParamsByDataSourceIdResult]
 
+  override def getConnectParamsByName(action: GetConnectParamsByDataSourceNameAction): GetConnectParamsByDataSourceNameResult = execute(action).asInstanceOf[GetConnectParamsByDataSourceNameResult]
+
   override def createDataSource(action: CreateDataSourceAction): CreateDataSourceResult = execute(action).asInstanceOf[CreateDataSourceResult]
 
   override def getDataSourceTestConnect(action: DataSourceTestConnectAction): DataSourceTestConnectResult = execute(action).asInstanceOf[DataSourceTestConnectResult]
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoPublishedByDataSourceNameAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoPublishedByDataSourceNameAction.scala
new file mode 100644
index 000000000..ff1f76439
--- /dev/null
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoPublishedByDataSourceNameAction.scala
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.linkis.datasource.client.request
+
+import org.apache.linkis.datasource.client.config.DatasourceClientConfig.DATA_SOURCE_SERVICE_MODULE
+import org.apache.linkis.datasource.client.exception.DataSourceClientBuilderException
+import org.apache.linkis.httpclient.request.GetAction
+
+
+class GetInfoPublishedByDataSourceNameAction extends GetAction with DataSourceAction {
+  private var dataSourceName: String = _
+
+  override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "publishedInfo", "name", dataSourceName)
+
+  private var user: String = _
+
+  override def setUser(user: String): Unit = this.user = user
+
+  override def getUser: String = this.user
+}
+
+
+
+object GetInfoPublishedByDataSourceNameAction {
+  def builder(): Builder = new Builder
+
+  class Builder private[GetInfoPublishedByDataSourceNameAction]() {
+    private var dataSourceName: String = _
+    private var system: String = _
+    private var user: String = _
+
+    def setUser(user: String): Builder = {
+      this.user = user
+      this
+    }
+
+    def setDataSourceName(dataSourceName: String): Builder = {
+      this.dataSourceName = dataSourceName
+      this
+    }
+
+    def setSystem(system: String): Builder = {
+      this.system = system
+      this
+    }
+
+    def build(): GetInfoPublishedByDataSourceNameAction = {
+      if (dataSourceName == null) throw new DataSourceClientBuilderException("dataSourceName is needed!")
+      if (system == null) throw new DataSourceClientBuilderException("system is needed!")
+      if (user == null) throw new DataSourceClientBuilderException("user is needed!")
+
+      val getPublishedInfoByDataSourceNameAction = new GetInfoPublishedByDataSourceNameAction
+      getPublishedInfoByDataSourceNameAction.dataSourceName = this.dataSourceName
+      getPublishedInfoByDataSourceNameAction.setParameter("system", system)
+      getPublishedInfoByDataSourceNameAction.setUser(user)
+      getPublishedInfoByDataSourceNameAction
+    }
+  }
+
+}
+
+
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoPublishedByDataSourceNameResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoPublishedByDataSourceNameResult.scala
new file mode 100644
index 000000000..813fb1fb0
--- /dev/null
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoPublishedByDataSourceNameResult.scala
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.linkis.datasource.client.response
+
+import org.apache.linkis.datasourcemanager.common.domain.DataSource
+import org.apache.linkis.httpclient.dws.DWSHttpClient
+import org.apache.linkis.httpclient.dws.annotation.DWSHttpMessageResult
+import org.apache.linkis.httpclient.dws.response.DWSResult
+
+import scala.beans.BeanProperty
+
+@DWSHttpMessageResult("/api/rest_j/v\\d+/data-source-manager/publishedInfo/name/(\\S+)")
+class GetInfoPublishedByDataSourceNameResult extends DWSResult {
+  @BeanProperty var info: java.util.Map[String, Any] = _
+
+  def getDataSource: DataSource = {
+    val str = DWSHttpClient.jacksonJson.writeValueAsString(info)
+    DWSHttpClient.jacksonJson.readValue(str, classOf[DataSource])
+  }
+}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestDataSourceClient.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestDataSourceClient.scala
index 595e046a9..09ca13ae0 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestDataSourceClient.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestDataSourceClient.scala
@@ -58,10 +58,35 @@ object TestDataSourceClient {
 
     val dataSourceClient = new LinkisDataSourceRemoteClient(clientConfig)
 
-    val getDataSourceByName = dataSourceClient.getInfoByDataSourceName(GetInfoByDataSourceNameAction.builder()
-    .setDataSourceName("test_mysql")
-    .setUser("linkis")
-    .setSystem("").build()).getDataSource
+      val getDataSourceByName = dataSourceClient.getInfoByDataSourceName(GetInfoByDataSourceNameAction.builder()
+        .setDataSourceName("mysql_test_0706")
+        .setUser("hadoop")
+        .setSystem("").build()).getDataSource
+
+
+
+      val getDataSourceByName2 = dataSourceClient.getInfoByDataSourceId(GetInfoByDataSourceIdAction.builder()
+        .setDataSourceId(2)
+        .setUser("hadoop")
+        .setSystem("").build()).getDataSource
+
+
+
+      val dataSource = dataSourceClient.getInfoPublishedByDataSourceName(GetInfoPublishedByDataSourceNameAction.builder()
+        .setDataSourceName("mysql_test_0706")
+        .setUser("hadoop")
+        .setSystem("").build()).getDataSource
+
+
+
+
+
+
+
+
+
+
+
 
     val getAllDataSourceTypesResult = dataSourceClient.getAllDataSourceTypes(GetAllDataSourceTypesAction.builder().setUser("linkis").build()).getAllDataSourceType
 
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java
index ca5cffe30..b0b1bdab1 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java
@@ -341,6 +341,39 @@ public class DataSourceCoreRestfulApi {
                 "Fail to access data source[获取数据源信息失败]");
     }
 
+
+    @ApiOperation(value = "getPublishedInfoByDataSourceName", notes = "get published info by data source name", response = Message.class)
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "dataSourceName", required = true, dataType = "String", value = "data source name")
+    })
+    @RequestMapping(value = "/publishedInfo/name/{dataSourceName}", method = RequestMethod.GET)
+    public Message getPublishedInfoByDataSourceName(
+        @PathVariable("dataSourceName") String dataSourceName, HttpServletRequest request)
+        throws UnsupportedEncodingException {
+        return RestfulApiHelper.doAndResponse(
+            () -> {
+                DataSource dataSource = dataSourceInfoService.getDataSourcePublishInfo(dataSourceName);
+
+                if (dataSource == null) {
+                    return Message.error("No Exists The DataSource [不存在该数据源]");
+                }
+
+                if (!AuthContext.hasPermission(dataSource, request)) {
+                    return Message.error(
+                        "Don't have query permission for data source [没有数据源的查询权限]");
+                }
+                // Decrypt
+                RestfulApiHelper.decryptPasswordKey(
+                    dataSourceRelateService.getKeyDefinitionsByType(
+                        dataSource.getDataSourceTypeId()),
+                    dataSource.getConnectParams());
+
+                return Message.ok().data("info", dataSource);
+            },
+            "Fail to access data source[获取数据源信息失败]");
+    }
+
+
     /**
      * get datasource detail
      *
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/service/DataSourceInfoService.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/service/DataSourceInfoService.java
index e00ed8880..4131eb6be 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/service/DataSourceInfoService.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/service/DataSourceInfoService.java
@@ -62,6 +62,15 @@ public interface DataSourceInfoService {
      * @return data source entity
      */
     DataSource getDataSourceInfo(String dataSourceName);
+
+    /**
+     * Get data source for latest published version by data source name
+     *
+     * @param dataSourceName data source name
+     * @return data source entity
+     */
+    DataSource getDataSourcePublishInfo(String dataSourceName);
+
     /**
      * Get data source
      *
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/service/impl/DataSourceInfoServiceImpl.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/service/impl/DataSourceInfoServiceImpl.java
index 0d165e78f..e5e7bfb42 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/service/impl/DataSourceInfoServiceImpl.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/service/impl/DataSourceInfoServiceImpl.java
@@ -24,7 +24,10 @@ import org.apache.linkis.datasourcemanager.common.domain.DataSourceParamKeyDefin
 import org.apache.linkis.datasourcemanager.common.domain.DatasourceVersion;
 import org.apache.linkis.datasourcemanager.common.exception.JsonErrorException;
 import org.apache.linkis.datasourcemanager.common.util.json.Json;
-import org.apache.linkis.datasourcemanager.core.dao.*;
+import org.apache.linkis.datasourcemanager.core.dao.DataSourceDao;
+import org.apache.linkis.datasourcemanager.core.dao.DataSourceEnvDao;
+import org.apache.linkis.datasourcemanager.core.dao.DataSourceParamKeyDao;
+import org.apache.linkis.datasourcemanager.core.dao.DataSourceVersionDao;
 import org.apache.linkis.datasourcemanager.core.formdata.FormStreamContent;
 import org.apache.linkis.datasourcemanager.core.service.BmlAppService;
 import org.apache.linkis.datasourcemanager.core.service.DataSourceInfoService;
@@ -44,7 +47,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
@@ -109,6 +116,23 @@ public class DataSourceInfoServiceImpl implements DataSourceInfoService {
         return dataSource;
     }
 
+    @Override
+    public DataSource getDataSourcePublishInfo(String dataSourceName) {
+        DataSource dataSource = dataSourceDao.selectOneDetailByName(dataSourceName);
+        if (Objects.nonNull(dataSource)) {
+            Long publishedVersionId = dataSource.getPublishedVersionId();
+            if (publishedVersionId == null) {
+                LOG.warn("Datasource name:{} is not published. ", dataSourceName);
+            } else {
+                String parameter =
+                        dataSourceVersionDao.selectOneVersion(
+                                dataSource.getId(), publishedVersionId);
+                dataSource.setParameter(parameter);
+            }
+        }
+        return dataSource;
+    }
+
     @Override
     public DataSource getDataSourceInfo(Long dataSourceId, Long version) {
         DataSource dataSource = dataSourceDao.selectOneDetail(dataSourceId);
@@ -122,9 +146,6 @@ public class DataSourceInfoServiceImpl implements DataSourceInfoService {
     /**
      * get datasource info for connect for published version, if there is a dependency environment,
      * merge datasource parameter and environment parameter.
-     *
-     * @param dataSourceId
-     * @return
      */
     @Override
     public DataSource getDataSourceInfoForConnect(Long dataSourceId) {
@@ -180,10 +201,6 @@ public class DataSourceInfoServiceImpl implements DataSourceInfoService {
     /**
      * get datasource info for connect, if there is a dependency environment, merge datasource
      * parameter and environment parameter.
-     *
-     * @param dataSourceId
-     * @param version
-     * @return
      */
     @Override
     public DataSource getDataSourceInfoForConnect(Long dataSourceId, Long version) {
@@ -329,12 +346,7 @@ public class DataSourceInfoServiceImpl implements DataSourceInfoService {
         return pageInfo.getList();
     }
 
-    /**
-     * expire data source
-     *
-     * @param dataSourceId
-     * @return
-     */
+    /** expire data source */
     @Override
     public Long expireDataSource(Long dataSourceId) {
         DataSource dataSource = dataSourceDao.selectOne(dataSourceId);
@@ -348,12 +360,7 @@ public class DataSourceInfoServiceImpl implements DataSourceInfoService {
         return -1L;
     }
 
-    /**
-     * publish datasource by id set published_version_id to versionId;
-     *
-     * @param dataSourceId
-     * @return
-     */
+    /** publish datasource by id set published_version_id to versionId; */
     @Override
     public int publishByDataSourceId(Long dataSourceId, Long versionId) {
         Long latestVersion = dataSourceVersionDao.getLatestVersion(dataSourceId);
@@ -366,13 +373,6 @@ public class DataSourceInfoServiceImpl implements DataSourceInfoService {
 
     /**
      * insert a datasource parameter, return new version, and update current versionId of datasource
-     *
-     * @param keyDefinitionList
-     * @param datasourceId
-     * @param connectParams
-     * @param username
-     * @param comment
-     * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -420,12 +420,7 @@ public class DataSourceInfoServiceImpl implements DataSourceInfoService {
         return newVersionId;
     }
 
-    /**
-     * get datasource version list
-     *
-     * @param datasourceId
-     * @return
-     */
+    /** get datasource version list */
     @Override
     public List<DatasourceVersion> getVersionList(Long datasourceId) {
         List<DatasourceVersion> versionList =
@@ -433,14 +428,7 @@ public class DataSourceInfoServiceImpl implements DataSourceInfoService {
         return versionList;
     }
 
-    /**
-     * @param userName
-     * @param keyDefinitionList
-     * @param updatedParams
-     * @param storedParams
-     * @param parameterCallback
-     * @throws ErrorException
-     */
+    /** */
     private void updateConnectParams(
             String userName,
             List<DataSourceParamKeyDefinition> keyDefinitionList,
@@ -511,13 +499,7 @@ public class DataSourceInfoServiceImpl implements DataSourceInfoService {
         }
     }
 
-    /**
-     * Upload the form stream context in connect parameters, and serialize parameters
-     *
-     * @param keyDefinitionList
-     * @param connectParams
-     * @param parameterCallback
-     */
+    /** Upload the form stream context in connect parameters, and serialize parameters */
     private void storeConnectParams(
             String userName,
             List<DataSourceParamKeyDefinition> keyDefinitionList,


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org