[Feature][linkis-public-enhancements] Merge pes client and common (ap…

…ache#4853) * merge pes client and common * fix cs common * optimize import * optimize import * rename module linkis-rpc-client to be linkis-pes-rpc-client
WeDataSphere · Aug 7, 2023 · dacd2c8 · dacd2c8
1 parent 958c494
commit dacd2c8
Show file tree

Hide file tree

Showing 448 changed files with 106 additions and 730 deletions.
diff --git a/docs/configuration/linkis-instance-label-client.md b/docs/configuration/linkis-instance-label-client.md
@@ -1,5 +1,5 @@
-## linkis-instance-label-client 配置
+## linkis-pes-rpc-client 配置
 
-| 模块名(服务名) | 参数名 | 默认值 | 描述 |
-| -------- | -------- | ----- |----- |
-| linkis-instance-label-client |wds.linkis.instance.label.server.name|linkis-ps-publicservice|instance.label.server.name|
+| 模块名(服务名)              | 参数名 | 默认值 | 描述 |
+|-----------------------| -------- | ----- |----- |
+| linkis-pes-rpc-client |wds.linkis.instance.label.server.name|linkis-ps-publicservice|instance.label.server.name|
diff --git a/docs/errorcode/linkis-bml-client.md b/docs/errorcode/linkis-bml-client.md
@@ -1,9 +1,9 @@
-## linkis-bml-client errorcode
+## linkis-pes-client errorcode
 
 
-| 模块名(服务名) | 错误码   | 描述 | enumeration name(枚举)| Exception Class(类名)|
-| -------- |-------| ----- |---------|---------|
-|linkis-bml-client| 20060 |the result returned by the repository client POST request does not match(物料库客户端POST请求返回的result不匹配)|POST_REQUEST_RESULT_NOT_MATCH|BmlClientErrorCodeSummary|
-|linkis-bml-client| 20061 |failed to copy inputStream and outputStream (inputStream和outputStream流copy失败)|BML_CLIENT_FAILED|BmlClientErrorCodeSummary|
-|linkis-bml-client| 20062 |serverUrl cannot be null(serverUrl 不能为空)|SERVER_URL_NOT_NULL|BmlClientErrorCodeSummary|
+| 模块名(服务名)          | 错误码   | 描述 | enumeration name(枚举)| Exception Class(类名)|
+|-------------------|-------| ----- |---------|---------|
+| linkis-pes-client | 20060 |the result returned by the repository client POST request does not match(物料库客户端POST请求返回的result不匹配)|POST_REQUEST_RESULT_NOT_MATCH|BmlClientErrorCodeSummary|
+| linkis-pes-client | 20061 |failed to copy inputStream and outputStream (inputStream和outputStream流copy失败)|BML_CLIENT_FAILED|BmlClientErrorCodeSummary|
+| linkis-pes-client | 20062 |serverUrl cannot be null(serverUrl 不能为空)|SERVER_URL_NOT_NULL|BmlClientErrorCodeSummary|
 
diff --git a/docs/errorcode/linkis-cs-client-errorcode.md b/docs/errorcode/linkis-cs-client-errorcode.md
@@ -1,16 +1,16 @@
-## linkis-cs-client   errorcode
+## linkis-pes-client   errorcode
 
-| module name(模块名) | error code(错误码)  | describe(描述) |enumeration name(枚举)| Exception Class(类名)|
-| -------- | -------- | ----- |-----|-----|
-|linkis-cs-client  |80015|create context failed(创建上下文失败)|CREATE_CONTEXT_FAILED|CsClientErrorCodeSummary|
-|linkis-cs-client  |80015|get context value failed(获取上下文值失败)|GET_CONTEXT_VALUE_FAILED|CsClientErrorCodeSummary|
-|linkis-cs-client  |80015|update context failed(更新上下文失败)|UPDATE_CONTEXT_FAILED|CsClientErrorCodeSummary|
-|linkis-cs-client  |80015|reset context failed(重置上下文失败)|RESET_CONTEXT_FAILED|CsClientErrorCodeSummary|
-|linkis-cs-client  |80015|remove context failed(刪除上下文失败)|REMOVE_CONTEXT_FAILED|CsClientErrorCodeSummary|
-|linkis-cs-client  |80015|bind context id failed(绑定上下文 ID 失败)|BIND_CONTEXTID_FAILED|CsClientErrorCodeSummary|
-|linkis-cs-client  |80015|search condition failed(搜索失败)|SEARCH_CONDITION_FAILED|CsClientErrorCodeSummary|
-|linkis-cs-client  |80015|execute  failed(执行失败)|EXECUTE_FALIED|CsClientErrorCodeSummary|
-|linkis-cs-client  |80017|searchHAIDByTime failed(搜索HAIDByTime失败)|HAIDBYTIME_FAILED|CsClientErrorCodeSummary|
-|linkis-cs-client  |80017|batch Clear Context By HAID failed(通过 HAID 批量清除上下文失败)|CLEAR_CONTEXT_HAID_FAILED|CsClientErrorCodeSummary|
+| module name(模块名)  | error code(错误码)  | describe(描述) |enumeration name(枚举)| Exception Class(类名)|
+|-------------------| -------- | ----- |-----|-----|
+| linkis-pes-client |80015|create context failed(创建上下文失败)|CREATE_CONTEXT_FAILED|CsClientErrorCodeSummary|
+| linkis-pes-client  |80015|get context value failed(获取上下文值失败)|GET_CONTEXT_VALUE_FAILED|CsClientErrorCodeSummary|
+| linkis-pes-client  |80015|update context failed(更新上下文失败)|UPDATE_CONTEXT_FAILED|CsClientErrorCodeSummary|
+| linkis-pes-client  |80015|reset context failed(重置上下文失败)|RESET_CONTEXT_FAILED|CsClientErrorCodeSummary|
+| linkis-pes-client  |80015|remove context failed(刪除上下文失败)|REMOVE_CONTEXT_FAILED|CsClientErrorCodeSummary|
+| linkis-pes-client  |80015|bind context id failed(绑定上下文 ID 失败)|BIND_CONTEXTID_FAILED|CsClientErrorCodeSummary|
+| linkis-pes-client  |80015|search condition failed(搜索失败)|SEARCH_CONDITION_FAILED|CsClientErrorCodeSummary|
+| linkis-pes-client  |80015|execute  failed(执行失败)|EXECUTE_FALIED|CsClientErrorCodeSummary|
+| linkis-pes-client  |80017|searchHAIDByTime failed(搜索HAIDByTime失败)|HAIDBYTIME_FAILED|CsClientErrorCodeSummary|
+| linkis-pes-client  |80017|batch Clear Context By HAID failed(通过 HAID 批量清除上下文失败)|CLEAR_CONTEXT_HAID_FAILED|CsClientErrorCodeSummary|
 
 
diff --git a/docs/errorcode/linkis-datasource-client-errorcode.md b/docs/errorcode/linkis-datasource-client-errorcode.md
@@ -1,16 +1,16 @@
-## linkis-datasource-client   errorcode
+## linkis-pes-client   errorcode
 
 | module name(模块名) | error code(错误码)  | describe(描述) |enumeration name(枚举)| Exception Class(类名)|
 | -------- | -------- | ----- |-----|-----|
-|linkis-datasource-client  |31000|serverUrl cannot be null.(serverUrl 不能为空.)|SERVERURL_CANNOT_NULL|DatasourceClientErrorCodeSummary|
-|linkis-datasource-client  |31000|version is needed!(版本为空！)|VERSION_NEEDED|DatasourceClientErrorCodeSummary|
-|linkis-datasource-client  |31000|version is needed!(需要版本ID！)"|VERSIONID_NEEDED|DatasourceClientErrorCodeSummary|
-|linkis-datasource-client  |31000|dataSourceId is needed!(需要dataSourceId！)|DATASOURCEID_NEEDED|DatasourceClientErrorCodeSummary|
-|linkis-datasource-client  |31000|dataSourceName is needed!(需要dataSourceName！)|DATASOURCENAME_NEEDED|DatasourceClientErrorCodeSummary|
-|linkis-datasource-client  |31000|user is needed!(用户为空！)|USER_NEEDED|DatasourceClientErrorCodeSummary|
-|linkis-datasource-client  |31000|system is needed!(系统为空！)|SYSTEM_NEEDED|DatasourceClientErrorCodeSummary|
-|linkis-datasource-client  |31000|Cannot encode the name of data source:{0} for request(无法对请求的数据源名称进行编码：{0})|CANNOT_SOURCE|DatasourceClientErrorCodeSummary|
-|linkis-datasource-client  |31000|database is needed!(数据库为空！)|DATABASE_NEEDED|DatasourceClientErrorCodeSummary|
-|linkis-datasource-client  |31000|table is needed!(表为空！)|TABLE_NEEDED|DatasourceClientErrorCodeSummary|
+|linkis-pes-client  |31000|serverUrl cannot be null.(serverUrl 不能为空.)|SERVERURL_CANNOT_NULL|DatasourceClientErrorCodeSummary|
+|linkis-pes-client  |31000|version is needed!(版本为空！)|VERSION_NEEDED|DatasourceClientErrorCodeSummary|
+|linkis-pes-client  |31000|version is needed!(需要版本ID！)"|VERSIONID_NEEDED|DatasourceClientErrorCodeSummary|
+|linkis-pes-client  |31000|dataSourceId is needed!(需要dataSourceId！)|DATASOURCEID_NEEDED|DatasourceClientErrorCodeSummary|
+|linkis-pes-client  |31000|dataSourceName is needed!(需要dataSourceName！)|DATASOURCENAME_NEEDED|DatasourceClientErrorCodeSummary|
+|linkis-pes-client  |31000|user is needed!(用户为空！)|USER_NEEDED|DatasourceClientErrorCodeSummary|
+|linkis-pes-client  |31000|system is needed!(系统为空！)|SYSTEM_NEEDED|DatasourceClientErrorCodeSummary|
+|linkis-pes-client  |31000|Cannot encode the name of data source:{0} for request(无法对请求的数据源名称进行编码：{0})|CANNOT_SOURCE|DatasourceClientErrorCodeSummary|
+|linkis-pes-client  |31000|database is needed!(数据库为空！)|DATABASE_NEEDED|DatasourceClientErrorCodeSummary|
+|linkis-pes-client  |31000|table is needed!(表为空！)|TABLE_NEEDED|DatasourceClientErrorCodeSummary|
 
 
diff --git a/linkis-computation-governance/linkis-client/linkis-computation-client/pom.xml b/linkis-computation-governance/linkis-client/linkis-computation-client/pom.xml
@@ -58,7 +58,7 @@
 
     <dependency>
       <groupId>org.apache.linkis</groupId>
-      <artifactId>linkis-bml-client</artifactId>
+      <artifactId>linkis-pes-client</artifactId>
       <version>${project.version}</version>
       <exclusions>
         <exclusion>

diff --git a/...computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/pom.xml b/...computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/pom.xml
@@ -30,7 +30,7 @@
 
     <dependency>
       <groupId>org.apache.linkis</groupId>
-      <artifactId>linkis-udf-client</artifactId>
+      <artifactId>linkis-pes-rpc-client</artifactId>
       <version>${project.version}</version>
     </dependency>
 
@@ -55,7 +55,7 @@
 
     <dependency>
       <groupId>org.apache.linkis</groupId>
-      <artifactId>linkis-bml-client</artifactId>
+      <artifactId>linkis-pes-client</artifactId>
       <version>${project.version}</version>
     </dependency>
 

diff --git a/...n-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/pom.xml b/...n-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/pom.xml
@@ -41,7 +41,7 @@
 
     <dependency>
       <groupId>org.apache.linkis</groupId>
-      <artifactId>linkis-bml-client</artifactId>
+      <artifactId>linkis-pes-client</artifactId>
       <version>${project.version}</version>
     </dependency>
 

diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/pom.xml b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/pom.xml
@@ -30,7 +30,7 @@
 
     <dependency>
       <groupId>org.apache.linkis</groupId>
-      <artifactId>linkis-udf-client</artifactId>
+      <artifactId>linkis-pes-rpc-client</artifactId>
       <version>${project.version}</version>
     </dependency>
 
@@ -60,18 +60,6 @@
       <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.linkis</groupId>
-      <artifactId>linkis-cs-client</artifactId>
-      <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.reflections</groupId>
-          <artifactId>reflections</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.linkis</groupId>
       <artifactId>linkis-computation-governance-common</artifactId>
@@ -80,9 +68,13 @@
 
     <dependency>
       <groupId>org.apache.linkis</groupId>
-      <artifactId>linkis-bml-client</artifactId>
+      <artifactId>linkis-pes-client</artifactId>
       <version>${project.version}</version>
       <exclusions>
+        <exclusion>
+          <groupId>org.reflections</groupId>
+          <artifactId>reflections</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>org.apache.httpcomponents</groupId>
           <artifactId>httpclient</artifactId>

diff --git a/linkis-computation-governance/linkis-entrance/pom.xml b/linkis-computation-governance/linkis-entrance/pom.xml
@@ -62,13 +62,7 @@
 
     <dependency>
       <groupId>org.apache.linkis</groupId>
-      <artifactId>linkis-cs-client</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.linkis</groupId>
-      <artifactId>linkis-error-code-client</artifactId>
+      <artifactId>linkis-pes-client</artifactId>
       <version>${project.version}</version>
     </dependency>
 
@@ -92,13 +86,7 @@
 
     <dependency>
       <groupId>org.apache.linkis</groupId>
-      <artifactId>linkis-bml-client</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.linkis</groupId>
-      <artifactId>linkis-instance-label-client</artifactId>
+      <artifactId>linkis-pes-rpc-client</artifactId>
       <version>${project.version}</version>
     </dependency>
 

diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/pom.xml b/linkis-computation-governance/linkis-manager/linkis-application-manager/pom.xml
@@ -47,7 +47,7 @@
 
     <dependency>
       <groupId>org.apache.linkis</groupId>
-      <artifactId>linkis-bml-client</artifactId>
+      <artifactId>linkis-pes-client</artifactId>
       <version>${project.version}</version>
       <exclusions>
         <exclusion>

diff --git a/linkis-engineconn-plugins/jdbc/pom.xml b/linkis-engineconn-plugins/jdbc/pom.xml
@@ -188,7 +188,7 @@
 
     <dependency>
       <groupId>org.apache.linkis</groupId>
-      <artifactId>linkis-datasource-client</artifactId>
+      <artifactId>linkis-pes-client</artifactId>
       <version>${project.version}</version>
       <exclusions>
         <exclusion>

diff --git a/linkis-engineconn-plugins/spark/pom.xml b/linkis-engineconn-plugins/spark/pom.xml
@@ -352,7 +352,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.linkis</groupId>
-      <artifactId>linkis-datasource-client</artifactId>
+      <artifactId>linkis-pes-client</artifactId>
       <version>${project.version}</version>
       <exclusions>
         <exclusion>

diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-common/pom.xml b/linkis-public-enhancements/linkis-bml/linkis-bml-common/pom.xml
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/pom.xml b/linkis-public-enhancements/linkis-bml/linkis-bml-server/pom.xml
@@ -34,7 +34,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.linkis</groupId>
-      <artifactId>linkis-bml-common</artifactId>
+      <artifactId>linkis-pes-common</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

diff --git a/linkis-public-enhancements/linkis-bml/pom.xml b/linkis-public-enhancements/linkis-bml/pom.xml
@@ -28,9 +28,7 @@
 
   <packaging>pom</packaging>
   <modules>
-    <module>linkis-bml-common</module>
     <module>linkis-bml-server</module>
-    <module>linkis-bml-client</module>
   </modules>
 
 </project>
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/pom.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/pom.xml
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/pom.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/pom.xml
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml
@@ -29,7 +29,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.linkis</groupId>
-      <artifactId>linkis-cs-common</artifactId>
+      <artifactId>linkis-pes-common</artifactId>
       <version>${project.version}</version>
     </dependency>
 
@@ -41,13 +41,7 @@
 
     <dependency>
       <groupId>org.apache.linkis</groupId>
-      <artifactId>linkis-cs-listener</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.linkis</groupId>
-      <artifactId>linkis-instance-label-client</artifactId>
+      <artifactId>linkis-pes-rpc-client</artifactId>
       <version>${project.version}</version>
     </dependency>