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/03/10 01:44:55 UTC
[incubator-linkis] 08/10: adjust uniform dataSourceId parameter name
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.0-datasource
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 884141ccfab4c533726aae7c4c6f1f06bf64c83d
Author: casionone <ca...@gmail.com>
AuthorDate: Wed Mar 9 19:48:48 2022 +0800
adjust uniform dataSourceId parameter name
---
db/linkis_dml.sql | 2 +-
.../client/request/GetConnectParamsByDataSourceIdAction.scala | 2 +-
.../request/GetConnectParamsByDataSourceNameAction.scala | 2 +-
.../client/response/GetConnectParamsByDataSourceIdResult.scala | 2 +-
.../response/GetConnectParamsByDataSourceNameResult.scala | 2 +-
.../core/restful/DataSourceCoreRestfulApi.java | 4 ++--
.../core/restful/DataSourceAdminRestfulApiTest.java | 6 +++---
.../core/restful/DataSourceCoreRestfulApiTest.java | 10 +++++-----
8 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/db/linkis_dml.sql b/db/linkis_dml.sql
index a7d7232..fb62648 100644
--- a/db/linkis_dml.sql
+++ b/db/linkis_dml.sql
@@ -330,7 +330,7 @@ INSERT INTO `linkis_ps_dm_datasource_type_key` VALUES
(3,1,'params','连接参数',NULL,'TEXT',NULL,0,'输入JSON格式: {\"param\":\"value\"}',NULL,NULL,NULL,NULL,'2021-12-06 10:35:00','2021-12-06 10:35:00'),
(9,1,'username','用户名',NULL,'TEXT',NULL,1,'用户名','^[0-9A-Za-z_-]+$',NULL,NULL,NULL,'2021-04-12 01:54:39','2021-04-12 01:54:39'),
(10,1,'password','密码',NULL,'PASSWORD',NULL,1,'密码','',NULL,NULL,NULL,'2021-04-12 01:54:39','2021-04-12 01:54:39'),
-(11,4,'envId','集群环境',NULL,'SELECT',NULL,1,'集群环境',NULL,NULL,NULL,'/api/rest_j/v1/data-source-manager/env_list/all/type/4','2021-05-12 03:03:34','2021-05-12 03:03:34');
+(11,4,'envId','集群环境',NULL,'SELECT',NULL,1,'集群环境',NULL,NULL,NULL,'/api/rest_j/v1/data-source-manager/env-list/all/type/4','2021-05-12 03:03:34','2021-05-12 03:03:34');
INSERT INTO `linkis_ps_dm_datasource_env` VALUES
(1,'测试环境SIT','测试环境SIT',4,'{\"uris\":\"thrift://localhost:9083\", \"hadoopConf\":{\"hive.metastore.execute.setugi\":\"true\"}}','2021-10-26 14:57:29',NULL,'2021-10-26 14:57:29',NULL),
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceIdAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceIdAction.scala
index 9c0daf7..3725f91 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceIdAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceIdAction.scala
@@ -25,7 +25,7 @@ import org.apache.linkis.httpclient.request.GetAction
class GetConnectParamsByDataSourceIdAction extends GetAction with DataSourceAction {
private var dataSourceId: Long = _
- override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, dataSourceId.toString, "connect_params")
+ override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, dataSourceId.toString, "connect-params")
private var user: String = _
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceNameAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceNameAction.scala
index 19d6de0..cade0d5 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceNameAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceNameAction.scala
@@ -31,7 +31,7 @@ class GetConnectParamsByDataSourceNameAction extends GetAction with DataSourceAc
private var user: String = _
- override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "name", dataSourceName, "connect_params")
+ override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "name", dataSourceName, "connect-params")
override def setUser(user: String): Unit = this.user = user
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceIdResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceIdResult.scala
index e42ec28..c8b39b7 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceIdResult.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceIdResult.scala
@@ -22,7 +22,7 @@ import org.apache.linkis.httpclient.dws.response.DWSResult
import scala.beans.BeanProperty
-@DWSHttpMessageResult("/api/rest_j/v\\d+/data-source-manager/(\\S+)/connect_params")
+@DWSHttpMessageResult("/api/rest_j/v\\d+/data-source-manager/(\\S+)/connect-params")
class GetConnectParamsByDataSourceIdResult extends DWSResult{
@BeanProperty var connectParams: java.util.Map[String, Any] = _
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceNameResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceNameResult.scala
index 0cd2ea2..d84828c 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceNameResult.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceNameResult.scala
@@ -21,7 +21,7 @@ import org.apache.linkis.httpclient.dws.response.DWSResult
import scala.beans.BeanProperty
-@DWSHttpMessageResult("/api/rest_j/v\\d+/data-source-manager/name/(\\S+)/connect_params")
+@DWSHttpMessageResult("/api/rest_j/v\\d+/data-source-manager/name/(\\S+)/connect-params")
class GetConnectParamsByDataSourceNameResult extends DWSResult{
@BeanProperty var connectParams: java.util.Map[String, Any] = _
}
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 1d9789e..c708fdd 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
@@ -445,7 +445,7 @@ public class DataSourceCoreRestfulApi {
* @param req
* @return
*/
- @RequestMapping(value = "/{dataSourceId}/connect_params", method = RequestMethod.GET)
+ @RequestMapping(value = "/{dataSourceId}/connect-params", method = RequestMethod.GET)
public Message getConnectParams(
@PathVariable("dataSourceId") Long dataSourceId, HttpServletRequest req) {
return RestfulApiHelper.doAndResponse(
@@ -471,7 +471,7 @@ public class DataSourceCoreRestfulApi {
"Fail to connect data source[连接数据源失败]");
}
- @RequestMapping(value = "/name/{dataSourceName}/connect_params", method = RequestMethod.GET)
+ @RequestMapping(value = "/name/{dataSourceName}/connect-params", method = RequestMethod.GET)
public Message getConnectParams(
@PathVariable("dataSourceName") String dataSourceName, HttpServletRequest req)
throws UnsupportedEncodingException {
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceAdminRestfulApiTest.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceAdminRestfulApiTest.java
index e9720c3..6a9dd6e 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceAdminRestfulApiTest.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceAdminRestfulApiTest.java
@@ -105,14 +105,14 @@ class DataSourceAdminRestfulApiTest {
Mockito.doNothing().when(dataSourceInfoService).saveDataSourceEnv(any());
assertTrue(
MessageStatus.SUCCESS() == mvcResult.getStatus()
- && "10".equals(mvcResult.getData().get("insert_id").toString()));
+ && "10".equals(mvcResult.getData().get("insertId").toString()));
}
@Test
void getAllEnvListByDataSourceType() throws Exception {
long dataSourceEnvTypeId = 10l;
String url =
- String.format("/data-source-manager/env_list/all/type/%s", dataSourceEnvTypeId);
+ String.format("/data-source-manager/env-list/all/type/%s", dataSourceEnvTypeId);
MvcUtils mvcUtils = new MvcUtils(mockMvc);
List<DataSourceEnv> envList = new ArrayList<>();
Mockito.when(dataSourceInfoService.listDataSourceEnvByType(dataSourceEnvTypeId))
@@ -154,7 +154,7 @@ class DataSourceAdminRestfulApiTest {
mvcResult = mvcUtils.getMessage(mvcUtils.buildMvcResultDelete(url));
assertTrue(
MessageStatus.SUCCESS() == mvcResult.getStatus()
- && "10".equals(mvcResult.getData().get("remove_id").toString()));
+ && "10".equals(mvcResult.getData().get("removeId").toString()));
}
@Test
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApiTest.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApiTest.java
index e863942..80d05c4 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApiTest.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApiTest.java
@@ -104,7 +104,7 @@ class DataSourceCoreRestfulApiTest {
Message res = mvcUtils.getMessage(mvcResult);
assertThat(dataSourceTypes)
.usingRecursiveComparison()
- .isEqualTo(res.getData().get("type_list"));
+ .isEqualTo(res.getData().get("typeList"));
}
@Test
@@ -116,11 +116,11 @@ class DataSourceCoreRestfulApiTest {
.thenReturn(keyDefinitions);
MvcResult mvcResult =
mvcUtils.buildMvcResultGet(
- String.format("/data-source-manager/key_define/type/%s", dataSourceTypeId));
+ String.format("/data-source-manager/key-define/type/%s", dataSourceTypeId));
Message res = mvcUtils.getMessage(mvcResult);
assertThat(keyDefinitions)
.usingRecursiveComparison()
- .isEqualTo(res.getData().get("key_define"));
+ .isEqualTo(res.getData().get("keyDefine"));
}
@Test
@@ -473,7 +473,7 @@ class DataSourceCoreRestfulApiTest {
void testGetConnectParamsById() throws Exception {
MvcUtils mvcUtils = new MvcUtils(mockMvc);
long dataSourceId = 1l;
- String url = String.format("/data-source-manager/%s/connect_params", dataSourceId);
+ String url = String.format("/data-source-manager/%s/connect-params", dataSourceId);
DataSource dataSource = new DataSource();
dataSource.setId(dataSourceId);
dataSource.setCreateUser("hadoop");
@@ -502,7 +502,7 @@ class DataSourceCoreRestfulApiTest {
void testGetConnectParamsByName() throws Exception {
MvcUtils mvcUtils = new MvcUtils(mockMvc);
String dataSourceName = "hive-test";
- String url = String.format("/data-source-manager/name/%s/connect_params", dataSourceName);
+ String url = String.format("/data-source-manager/name/%s/connect-params", dataSourceName);
DataSource dataSource = new DataSource();
dataSource.setDataSourceName(dataSourceName);
dataSource.setCreateUser("hadoop");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org