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/02/18 12:33:13 UTC
[incubator-linkis] branch dev-udf updated (8f5596f -> 41a979b)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a change to branch dev-udf
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git.
from 8f5596f Merge pull request #1478 from WeDataSphere/dev-1.1.2
new 2dd2659 conflict resolution
add 93b5ef9 Added Ecosystem chapter (#1496)
add 8ef8ffb add datasource action interface
add 545a9f7 add the request for create datasource action
add adde8bc add the request for datasource test connect action
add b720999 add the request for delete datasource action
add 6344170 add the request for expire datasource action
add e7c709f add the request for get all datasource types action
add 1cb2c55 add the request for get connect params by datasource id action
add 189a2f0 add the request for get connect params by datasource name action
add ee9dcf4 add the request for get datasource versions action
add e213729 add the request for get info by datasource id action
add 58fd70e add the request for get keytype of datasource action
add 219e963 add the request for get columns of metadata action
add 9a5e767 add the request for get databases of metadata action
add 7f7996e add the request for get partitions of metadata action
add 86bccbc add the request for get table props of metadata action
add e77758f add the request for get tables of metadata action
add 32c0a61 add the request for pushish datasource versons action
add c4e4463 add the request for query datasouce action
add 2c36f2f add the request for query datasouce env action
add c7bd33f add the request for update datasource action
add 0156fd8 add the request for update datasource param action
add b6ac1cf add the response for create datasource result
add 9b3a013 add the response for datasource test connect restult
add 59a1501 add the response for delete datasource result
add 9ec8f61 add the response for expire datasource result
add e59decf add the response for get all datasource types result
add 9f77db7 add the response for get connect params by datasource id result
add 0e3db6a add the response for get connect params by datasource name result
add 08c58fd add the response for get datasource versions result
add d604fa3 add the response for get info by datasource result
add ae2e000 add the response for get keytype by datasource result
add 0a96091 add the response for get column of metadata result
add 9e0d2d9 add the response for get databases of metadata result
add 8581f1e add the response for get partitions of metadata result
add 2b34710 add the response for get table props of metadata result
add 991bef7 add the response for get tables of metadata result
add 663e6d4 add the response for pushish datasource version result
add 95925b9 add the response for query datasource env result
add 9550c06 add the response for query datasource result
add f3c80b5 add the response for update datasource params result
add 8a1bff0 add the response for update datasource result
add 6904836 add linkis datasource remote client impl
add 72461f6 add linkis metadata remote client impl
add cea4d33 add linkis datasource client test case
add 85a3817 [CodeStyle] fix typo (#1457)
add e42c146 add linkis datasource web
add 32bc539 add component @form-create/iview and object-to-formdata
add 224a304 English is recommended
add 950f265 add License
add 1a9be50 add License
add 9387f8e menu order adjustment
add 1f66904 Set linkis version from 1.0.3 to 1.1.0 (#1459)
add 1e975fd [Fix] fix NPE in stream ops and remove some redundant code (#1470)
add d1da9f6 standardize the output message for better understanding (#1474)
add 9641def fix:apache#1358 (#1469)
add 5fee761 Fix issue #1507
add 7f09b8a 0.5 converts to 30m
add e0b38fd support all type url (#1510)
add 7c85355 Exclude jetty import #1513 (#1530)
add 16e4b59 Merge pull request #1532 from apache/dev-1.1.0-datasource
new 41a979b Merge remote-tracking branch 'origin/master' into dev-udf
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
LICENSE-binary-ui | 4 +-
README.md | 13 +
README_CN.md | 15 +-
.../assembly-combined/pom.xml | 2 +-
.../public-module-combined/pom.xml | 2 +-
assembly-combined-package/bin/install.sh | 2 +-
.../deploy-config/linkis-env.sh | 2 +-
assembly-combined-package/pom.xml | 2 +-
.../{LICENSE-svgo.txt => LICENSE-form-create.txt} | 4 +-
...ugin-vue.txt => LICENSE-object-to-formdata.txt} | 4 +-
linkis-commons/linkis-common/pom.xml | 2 +-
linkis-commons/linkis-hadoop-common/pom.xml | 2 +-
linkis-commons/linkis-httpclient/pom.xml | 2 +-
linkis-commons/linkis-module/pom.xml | 17 +-
.../apache/linkis/server/conf/Knife4jConfig.scala | 91 ---
linkis-commons/linkis-mybatis/pom.xml | 2 +-
linkis-commons/linkis-protocol/pom.xml | 2 +-
linkis-commons/linkis-rpc/pom.xml | 2 +-
linkis-commons/linkis-scheduler/pom.xml | 2 +-
linkis-commons/linkis-storage/pom.xml | 2 +-
linkis-commons/pom.xml | 2 +-
.../linkis-cli/linkis-cli-application/pom.xml | 2 +-
.../linkis-cli/linkis-cli-common/pom.xml | 2 +-
.../linkis-cli/linkis-cli-core/pom.xml | 2 +-
.../linkis-client/linkis-cli/pom.xml | 2 +-
.../linkis-computation-client/pom.xml | 2 +-
.../linkis-computation-governance-common/pom.xml | 2 +-
.../governance/common/paser/CodeParser.scala | 40 +-
.../linkis-engineconn-linux-launch/pom.xml | 2 +-
.../linkis-engineconn-manager-core/pom.xml | 2 +-
.../linkis-engineconn-manager-server/pom.xml | 2 +-
.../linkis-engineconn-manager/pom.xml | 2 +-
.../linkis-once-engineconn/pom.xml | 2 +-
.../linkis-computation-engineconn/pom.xml | 2 +-
.../linkis-engineconn-common/pom.xml | 2 +-
.../linkis-engineconn-core/pom.xml | 2 +-
.../accessible-executor/pom.xml | 2 +-
.../conf/AccessibleExecutorConfiguration.scala | 2 +-
.../callback-service/pom.xml | 2 +-
.../executor-core/pom.xml | 2 +-
.../resource-executor/pom.xml | 2 +-
.../linkis-engineconn/pom.xml | 2 +-
.../linkis-entrance/pom.xml | 2 +-
.../entrance/job/EntranceExecuteRequest.java | 12 +-
.../linkis/entrance/job/EntranceExecutionJob.java | 2 +-
.../entrance/parser/AbstractEntranceParser.java | 12 +-
.../entrance/execute/DefaultEntranceExecutor.scala | 4 +-
.../linkis-manager/label-common/pom.xml | 2 +-
.../linkis-manager/label-manager/pom.xml | 2 +-
.../linkis-application-manager/pom.xml | 2 +-
.../linkis-manager-common/pom.xml | 2 +-
.../linkis-manager-service-common/pom.xml | 2 +-
.../linkis-manager-persistence/pom.xml | 2 +-
.../linkis-manager/linkis-resource-manager/pom.xml | 2 +-
.../linkis-manager/pom.xml | 2 +-
linkis-computation-governance/pom.xml | 2 +-
.../engineconn-plugins/flink/pom.xml | 2 +-
.../engineconn-plugins/hive/pom.xml | 2 +-
.../engineconn-plugins/io_file/pom.xml | 2 +-
.../engineconn-plugins/jdbc/pom.xml | 2 +-
.../engineconn-plugins/pipeline/pom.xml | 2 +-
.../engineconn-plugins/python/pom.xml | 2 +-
.../engineconn-plugins/shell/pom.xml | 2 +-
.../engineconn-plugins/spark/pom.xml | 2 +-
.../spark/config/SparkConfiguration.scala | 2 +-
.../linkis-engineconn-plugin-cache/pom.xml | 2 +-
.../linkis-engineconn-plugin-core/pom.xml | 2 +-
.../linkis-engineconn-plugin-loader/pom.xml | 2 +-
.../linkis-engineconn-plugin-server/pom.xml | 2 +-
linkis-engineconn-plugins/pom.xml | 2 +-
linkis-extensions/linkis-io-file-client/pom.xml | 2 +-
linkis-extensions/pom.xml | 3 +-
.../linkis-code-orchestrator/pom.xml | 2 +-
.../linkis-computation-orchestrator/pom.xml | 2 +-
.../linkis-orchestrator-core/pom.xml | 2 +-
.../plugin/linkis-orchestrator-ecm-plugin/pom.xml | 2 +-
linkis-orchestrator/pom.xml | 2 +-
.../linkis-bml/linkis-bml-client/pom.xml | 2 +-
.../linkis-bml/linkis-bml-common/pom.xml | 2 +-
.../linkis-bml/linkis-bml-engine-hook/pom.xml | 2 +-
.../linkis-bml/linkis-bml-server/pom.xml | 2 +-
linkis-public-enhancements/linkis-bml/pom.xml | 2 +-
.../linkis-context-service/linkis-cs-cache/pom.xml | 2 +-
.../linkis-cs-client/pom.xml | 2 +-
.../linkis-cs-common/pom.xml | 2 +-
.../linkis-cs-engine-support/pom.xml | 2 +-
.../linkis-cs-highavailable/pom.xml | 2 +-
.../linkis-cs-listener/pom.xml | 2 +-
.../linkis-cs-persistence/pom.xml | 2 +-
.../linkis-cs-search/pom.xml | 2 +-
.../linkis-cs-server/pom.xml | 2 +-
.../linkis-context-service/pom.xml | 2 +-
.../linkis-datasource-client/pom.xml | 82 ---
.../datasource/client/AbstractRemoteClient.scala | 32 --
.../datasource/client/DataSourceRemoteClient.scala | 4 +-
.../datasource/client/MetaDataRemoteClient.scala | 5 +-
.../linkis/datasource/client/RemoteClient.scala | 29 -
.../client/config/DatasourceClientConfig.scala | 27 -
.../DataSourceClientBuilderException.scala | 27 -
.../client/impl/LinkisDataSourceRemoteClient.scala | 5 +-
.../client/impl/LinkisMetaDataRemoteClient.scala | 5 +-
.../client/request/CreateDataSourceAction.scala | 4 +-
.../request/DataSourceTestConnectAction.scala | 4 +-
.../client/request/DeleteDataSourceAction.scala | 4 +-
.../client/request/ExpireDataSourceAction.scala | 4 +-
.../request/GetAllDataSourceTypesAction.scala | 4 +-
.../GetConnectParamsByDataSourceIdAction.scala | 4 +-
.../GetConnectParamsByDataSourceNameAction.scala | 4 +-
.../request/GetDataSourceVersionsAction.scala | 3 +-
.../request/GetInfoByDataSourceIdAction.scala | 4 +-
.../request/GetKeyTypeDatasourceAction.scala | 2 +
.../client/request/MetadataGetColumnsAction.scala | 4 +-
.../request/MetadataGetDatabasesAction.scala | 4 +-
.../request/MetadataGetPartitionsAction.scala | 4 +-
.../request/MetadataGetTablePropsAction.scala | 4 +-
.../client/request/MetadataGetTablesAction.scala | 4 +-
.../request/PublishDataSourceVersionAction.scala | 4 +-
.../client/request/QueryDataSourceAction.scala | 4 +-
.../client/request/QueryDataSourceEnvAction.scala | 4 +-
.../client/request/UpdateDataSourceAction.scala | 4 +-
.../request/UpdateDataSourceParameterAction.scala | 4 +-
.../client/response/CreateDataSourceResult.scala | 1 +
.../response/DataSourceTestConnectResult.scala | 2 +-
.../client/response/DeleteDataSourceResult.scala | 1 +
.../client/response/ExpireDataSourceResult.scala | 1 +
.../response/GetAllDataSourceTypesResult.scala | 4 +-
.../GetConnectParamsByDataSourceIdResult.scala | 1 +
.../response/GetDataSourceVersionsResult.scala | 8 +-
.../response/GetInfoByDataSourceIdResult.scala | 1 +
.../response/GetKeyTypeDatasourceResult.scala | 8 +-
.../client/response/MetadataGetColumnsResult.scala | 2 +-
.../response/MetadataGetDatabasesResult.scala | 1 +
.../response/MetadataGetPartitionsResult.scala | 1 +
.../response/MetadataGetTablePropsResult.scala | 1 +
.../client/response/MetadataGetTablesResult.scala | 1 +
.../response/PublishDataSourceVersionResult.scala | 1 +
.../client/response/QueryDataSourceEnvResult.scala | 1 +
.../client/response/QueryDataSourceResult.scala | 1 +
.../response/UpdateDataSourceParameterResult.scala | 1 +
.../client/response/UpdateDataSourceResult.scala | 1 +
.../linkis-datasource-manager/common/pom.xml | 2 +-
.../datasourcemanager/common/DsmConfiguration.java | 27 -
.../linkis-datasource-manager/server/pom.xml | 2 +-
.../linkis-metadata-manager/common/pom.xml | 2 +-
.../linkis-metadata-manager/server/pom.xml | 2 +-
.../server/receiver/BaseMetaReceiver.scala | 67 ---
.../service/elasticsearch/pom.xml | 2 +-
.../linkis-metadata-manager/service/hive/pom.xml | 2 +-
.../linkis-metadata-manager/service/kafka/pom.xml | 2 +-
.../linkis-metadata-manager/service/mysql/pom.xml | 2 +-
.../linkis-datasource/linkis-metadata/pom.xml | 2 +-
.../linkis-datasource/pom.xml | 2 +-
.../linkis-configuration/pom.xml | 2 +-
.../linkis-error-code-client/pom.xml | 2 +-
.../linkis-error-code-common/pom.xml | 2 +-
.../linkis-error-code-server/pom.xml | 2 +-
.../linkis-publicservice/linkis-error-code/pom.xml | 2 +-
.../linkis-instance-label-client/pom.xml | 2 +-
.../linkis-instance-label-server/pom.xml | 2 +-
.../linkis-publicservice/linkis-jobhistory/pom.xml | 2 +-
.../linkis-storage-script-dev-client/pom.xml | 2 +-
.../linkis-storage-script-dev-server/pom.xml | 2 +-
.../linkis-udf/linkis-udf-client/pom.xml | 2 +-
.../linkis-udf/linkis-udf-common/pom.xml | 2 +-
.../linkis-udf/linkis-udf-service/pom.xml | 2 +-
.../linkis-publicservice/linkis-variable/pom.xml | 2 +-
.../linkis-publicservice/pom.xml | 2 +-
linkis-public-enhancements/pom.xml | 2 +-
.../linkis-service-discovery/linkis-eureka/pom.xml | 2 +-
.../datasource/client/TestDataSourceClient.scala | 0
.../linkis-gateway-core/pom.xml | 2 +-
.../linkis-gateway-httpclient-support/pom.xml | 2 +-
.../linkis-gateway-server-support/pom.xml | 2 +-
.../linkis-spring-cloud-gateway/pom.xml | 2 +-
.../linkis-service-gateway/pom.xml | 2 +-
linkis-spring-cloud-services/pom.xml | 2 +-
pom.xml | 4 +-
web/.env | 2 +-
web/package.json | 2 +
web/src/apps/linkis/i18n/common/en.json | 43 +-
web/src/apps/linkis/i18n/common/zh.json | 46 +-
.../apps/linkis/module/datasource/dataSourceApi.js | 144 +++++
.../datasourceForm}/index.scss | 81 +--
.../module/datasource/datasourceForm/index.vue | 268 +++++++++
.../module/datasource/datasourceType/index.scss | 111 ++++
.../module/datasource/datasourceType/index.vue | 76 +++
.../index.js | 6 +-
.../index.scss | 66 ++-
web/src/apps/linkis/module/datasource/index.vue | 613 +++++++++++++++++++++
web/src/apps/linkis/router.js | 16 +-
web/src/apps/linkis/view/linkis/index.vue | 1 +
web/src/main.js | 9 +-
192 files changed, 1683 insertions(+), 675 deletions(-)
copy licenses-binary-ui/{LICENSE-svgo.txt => LICENSE-form-create.txt} (96%)
copy licenses-binary-ui/{LICENSE-eslint-plugin-vue.txt => LICENSE-object-to-formdata.txt} (95%)
delete mode 100644 linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/conf/Knife4jConfig.scala
delete mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-client/pom.xml
delete mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/AbstractRemoteClient.scala
delete mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/RemoteClient.scala
delete mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/config/DatasourceClientConfig.scala
delete mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/exception/DataSourceClientBuilderException.scala
delete mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/DsmConfiguration.java
delete mode 100644 linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/scala/org/apache/linkis/metadatamanager/server/receiver/BaseMetaReceiver.scala
rename {linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/scala => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/test/java}/org/apache/linkis/datasource/client/TestDataSourceClient.scala (100%)
create mode 100644 web/src/apps/linkis/module/datasource/dataSourceApi.js
copy web/src/apps/linkis/module/{microServiceManagement => datasource/datasourceForm}/index.scss (58%)
create mode 100644 web/src/apps/linkis/module/datasource/datasourceForm/index.vue
create mode 100644 web/src/apps/linkis/module/datasource/datasourceType/index.scss
create mode 100644 web/src/apps/linkis/module/datasource/datasourceType/index.vue
copy web/src/apps/linkis/module/{microServiceManagement => datasource}/index.js (95%)
copy web/src/apps/linkis/module/{microServiceManagement => datasource}/index.scss (65%)
create mode 100644 web/src/apps/linkis/module/datasource/index.vue
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 02/02: Merge remote-tracking branch 'origin/master' into dev-udf
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-udf
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 41a979be3e0512ba7d644e0af217c91ed62697a5
Merge: 2dd2659 16e4b59
Author: peacewong <wp...@gmail.com>
AuthorDate: Fri Feb 18 20:32:42 2022 +0800
Merge remote-tracking branch 'origin/master' into dev-udf
# Conflicts:
# linkis-computation-governance/linkis-engineconn/linkis-engineconn-launch/pom.xml
# linkis-computation-governance/linkis-manager/linkis-manager-commons/linkis-resource-manager-common/pom.xml
# linkis-public-enhancements/linkis-publicservice/linkis-ps-common-lock/pom.xml
# linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/pom.xml
# linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/test/java/org/apache/linkis/datasource/client/TestDataSourceClient.scala
LICENSE-binary-ui | 4 +-
README.md | 13 +
README_CN.md | 15 +-
.../assembly-combined/pom.xml | 2 +-
.../public-module-combined/pom.xml | 2 +-
assembly-combined-package/bin/install.sh | 2 +-
.../deploy-config/linkis-env.sh | 2 +-
assembly-combined-package/pom.xml | 2 +-
licenses-binary-ui/LICENSE-form-create.txt | 21 +
licenses-binary-ui/LICENSE-object-to-formdata.txt | 21 +
linkis-commons/linkis-common/pom.xml | 2 +-
linkis-commons/linkis-hadoop-common/pom.xml | 2 +-
linkis-commons/linkis-httpclient/pom.xml | 2 +-
linkis-commons/linkis-module/pom.xml | 17 +-
.../apache/linkis/server/conf/Knife4jConfig.scala | 91 ---
linkis-commons/linkis-mybatis/pom.xml | 2 +-
linkis-commons/linkis-protocol/pom.xml | 2 +-
linkis-commons/linkis-rpc/pom.xml | 2 +-
linkis-commons/linkis-scheduler/pom.xml | 2 +-
linkis-commons/linkis-storage/pom.xml | 2 +-
linkis-commons/pom.xml | 2 +-
.../linkis-cli/linkis-cli-application/pom.xml | 2 +-
.../linkis-cli/linkis-cli-common/pom.xml | 2 +-
.../linkis-cli/linkis-cli-core/pom.xml | 2 +-
.../linkis-client/linkis-cli/pom.xml | 2 +-
.../linkis-computation-client/pom.xml | 2 +-
.../linkis-computation-governance-common/pom.xml | 2 +-
.../governance/common/paser/CodeParser.scala | 40 +-
.../linkis-engineconn-linux-launch/pom.xml | 2 +-
.../linkis-engineconn-manager-core/pom.xml | 2 +-
.../linkis-engineconn-manager-server/pom.xml | 2 +-
.../linkis-engineconn-manager/pom.xml | 2 +-
.../linkis-once-engineconn/pom.xml | 2 +-
.../linkis-computation-engineconn/pom.xml | 2 +-
.../linkis-engineconn-common/pom.xml | 2 +-
.../linkis-engineconn-core/pom.xml | 2 +-
.../accessible-executor/pom.xml | 2 +-
.../conf/AccessibleExecutorConfiguration.scala | 2 +-
.../callback-service/pom.xml | 2 +-
.../executor-core/pom.xml | 2 +-
.../resource-executor/pom.xml | 2 +-
.../linkis-engineconn/pom.xml | 2 +-
.../linkis-entrance/pom.xml | 2 +-
.../entrance/job/EntranceExecuteRequest.java | 12 +-
.../linkis/entrance/job/EntranceExecutionJob.java | 2 +-
.../entrance/parser/AbstractEntranceParser.java | 12 +-
.../entrance/execute/DefaultEntranceExecutor.scala | 4 +-
.../linkis-manager/label-common/pom.xml | 2 +-
.../linkis-manager/label-manager/pom.xml | 2 +-
.../linkis-application-manager/pom.xml | 2 +-
.../linkis-manager-common/pom.xml | 2 +-
.../linkis-manager-service-common/pom.xml | 2 +-
.../linkis-manager-persistence/pom.xml | 2 +-
.../linkis-manager/linkis-resource-manager/pom.xml | 2 +-
.../linkis-manager/pom.xml | 2 +-
linkis-computation-governance/pom.xml | 2 +-
.../engineconn-plugins/flink/pom.xml | 2 +-
.../engineconn-plugins/hive/pom.xml | 2 +-
.../engineconn-plugins/io_file/pom.xml | 2 +-
.../engineconn-plugins/jdbc/pom.xml | 2 +-
.../engineconn-plugins/pipeline/pom.xml | 2 +-
.../engineconn-plugins/python/pom.xml | 2 +-
.../engineconn-plugins/shell/pom.xml | 2 +-
.../engineconn-plugins/spark/pom.xml | 2 +-
.../spark/config/SparkConfiguration.scala | 2 +-
.../linkis-engineconn-plugin-cache/pom.xml | 2 +-
.../linkis-engineconn-plugin-core/pom.xml | 2 +-
.../linkis-engineconn-plugin-loader/pom.xml | 2 +-
.../linkis-engineconn-plugin-server/pom.xml | 2 +-
linkis-engineconn-plugins/pom.xml | 2 +-
linkis-extensions/linkis-io-file-client/pom.xml | 2 +-
linkis-extensions/pom.xml | 3 +-
.../linkis-code-orchestrator/pom.xml | 2 +-
.../linkis-computation-orchestrator/pom.xml | 2 +-
.../linkis-orchestrator-core/pom.xml | 2 +-
.../plugin/linkis-orchestrator-ecm-plugin/pom.xml | 2 +-
linkis-orchestrator/pom.xml | 2 +-
.../linkis-bml/linkis-bml-client/pom.xml | 2 +-
.../linkis-bml/linkis-bml-common/pom.xml | 2 +-
.../linkis-bml/linkis-bml-engine-hook/pom.xml | 2 +-
.../linkis-bml/linkis-bml-server/pom.xml | 2 +-
linkis-public-enhancements/linkis-bml/pom.xml | 2 +-
.../linkis-context-service/linkis-cs-cache/pom.xml | 2 +-
.../linkis-cs-client/pom.xml | 2 +-
.../linkis-cs-common/pom.xml | 2 +-
.../linkis-cs-engine-support/pom.xml | 2 +-
.../linkis-cs-highavailable/pom.xml | 2 +-
.../linkis-cs-listener/pom.xml | 2 +-
.../linkis-cs-persistence/pom.xml | 2 +-
.../linkis-cs-search/pom.xml | 2 +-
.../linkis-cs-server/pom.xml | 2 +-
.../linkis-context-service/pom.xml | 2 +-
.../datasource/client/DataSourceRemoteClient.scala | 38 ++
.../datasource/client/MetaDataRemoteClient.scala | 29 +
.../client/impl/LinkisDataSourceRemoteClient.scala | 59 ++
.../client/impl/LinkisMetaDataRemoteClient.scala | 38 ++
.../client/request/CreateDataSourceAction.scala | 70 +++
.../client/request/DataSourceAction.scala | 22 +
.../request/DataSourceTestConnectAction.scala | 79 +++
.../client/request/DeleteDataSourceAction.scala | 62 +++
.../client/request/ExpireDataSourceAction.scala | 63 +++
.../request/GetAllDataSourceTypesAction.scala | 52 ++
.../GetConnectParamsByDataSourceIdAction.scala | 75 +++
.../GetConnectParamsByDataSourceNameAction.scala | 83 +++
.../request/GetDataSourceVersionsAction.scala | 62 +++
.../request/GetInfoByDataSourceIdAction.scala | 73 +++
.../request/GetKeyTypeDatasourceAction.scala | 63 +++
.../client/request/MetadataGetColumnsAction.scala | 93 ++++
.../request/MetadataGetDatabasesAction.scala | 73 +++
.../request/MetadataGetPartitionsAction.scala | 91 +++
.../request/MetadataGetTablePropsAction.scala | 92 ++++
.../client/request/MetadataGetTablesAction.scala | 81 +++
.../request/PublishDataSourceVersionAction.scala | 74 +++
.../client/request/QueryDataSourceAction.scala | 103 ++++
.../client/request/QueryDataSourceEnvAction.scala | 89 +++
.../client/request/UpdateDataSourceAction.scala | 83 +++
.../request/UpdateDataSourceParameterAction.scala | 82 +++
.../client/response/CreateDataSourceResult.scala | 28 +
.../response/DataSourceTestConnectResult.scala | 28 +
.../client/response/DeleteDataSourceResult.scala | 28 +
.../client/response/ExpireDataSourceResult.scala | 28 +
.../response/GetAllDataSourceTypesResult.scala | 40 ++
.../GetConnectParamsByDataSourceIdResult.scala | 28 +
.../GetConnectParamsByDataSourceNameResult.scala | 27 +
.../response/GetDataSourceVersionsResult.scala | 40 ++
.../response/GetInfoByDataSourceIdResult.scala | 35 ++
.../response/GetKeyTypeDatasourceResult.scala | 40 ++
.../client/response/MetadataGetColumnsResult.scala | 39 ++
.../response/MetadataGetDatabasesResult.scala | 29 +
.../response/MetadataGetPartitionsResult.scala | 29 +
.../response/MetadataGetTablePropsResult.scala | 29 +
.../client/response/MetadataGetTablesResult.scala | 29 +
.../response/PublishDataSourceVersionResult.scala | 26 +
.../client/response/QueryDataSourceEnvResult.scala | 40 ++
.../client/response/QueryDataSourceResult.scala | 40 ++
.../response/UpdateDataSourceParameterResult.scala | 28 +
.../client/response/UpdateDataSourceResult.scala | 28 +
.../linkis-datasource-manager/common/pom.xml | 2 +-
.../linkis-datasource-manager/server/pom.xml | 2 +-
.../linkis-metadata-manager/common/pom.xml | 2 +-
.../linkis-metadata-manager/server/pom.xml | 2 +-
.../service/elasticsearch/pom.xml | 2 +-
.../linkis-metadata-manager/service/hive/pom.xml | 2 +-
.../linkis-metadata-manager/service/kafka/pom.xml | 2 +-
.../linkis-metadata-manager/service/mysql/pom.xml | 2 +-
.../linkis-datasource/linkis-metadata/pom.xml | 2 +-
.../linkis-datasource/pom.xml | 2 +-
.../linkis-configuration/pom.xml | 2 +-
.../linkis-error-code-client/pom.xml | 2 +-
.../linkis-error-code-common/pom.xml | 2 +-
.../linkis-error-code-server/pom.xml | 2 +-
.../linkis-publicservice/linkis-error-code/pom.xml | 2 +-
.../linkis-instance-label-client/pom.xml | 2 +-
.../linkis-instance-label-server/pom.xml | 2 +-
.../linkis-publicservice/linkis-jobhistory/pom.xml | 2 +-
.../linkis-storage-script-dev-client/pom.xml | 2 +-
.../linkis-storage-script-dev-server/pom.xml | 2 +-
.../linkis-udf/linkis-udf-client/pom.xml | 2 +-
.../linkis-udf/linkis-udf-common/pom.xml | 2 +-
.../linkis-udf/linkis-udf-service/pom.xml | 2 +-
.../linkis-publicservice/linkis-variable/pom.xml | 2 +-
.../linkis-publicservice/pom.xml | 2 +-
linkis-public-enhancements/pom.xml | 2 +-
.../linkis-service-discovery/linkis-eureka/pom.xml | 2 +-
.../datasource/client/TestDataSourceClient.scala | 78 +++
.../linkis-gateway-core/pom.xml | 2 +-
.../linkis-gateway-httpclient-support/pom.xml | 2 +-
.../linkis-gateway-server-support/pom.xml | 2 +-
.../linkis-spring-cloud-gateway/pom.xml | 2 +-
.../linkis-service-gateway/pom.xml | 2 +-
linkis-spring-cloud-services/pom.xml | 2 +-
pom.xml | 4 +-
web/.env | 2 +-
web/package.json | 2 +
web/src/apps/linkis/i18n/common/en.json | 43 +-
web/src/apps/linkis/i18n/common/zh.json | 46 +-
.../apps/linkis/module/datasource/dataSourceApi.js | 144 +++++
.../module/datasource/datasourceForm/index.scss | 78 +++
.../module/datasource/datasourceForm/index.vue | 268 +++++++++
.../module/datasource/datasourceType/index.scss | 111 ++++
.../module/datasource/datasourceType/index.vue | 76 +++
web/src/apps/linkis/module/datasource/index.js | 21 +
web/src/apps/linkis/module/datasource/index.scss | 65 +++
web/src/apps/linkis/module/datasource/index.vue | 613 +++++++++++++++++++++
web/src/apps/linkis/router.js | 16 +-
web/src/apps/linkis/view/linkis/index.vue | 1 +
web/src/main.js | 9 +-
187 files changed, 4154 insertions(+), 270 deletions(-)
diff --cc linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/conf/AccessibleExecutorConfiguration.scala
index 4bea680,27a38f7..dff9b79
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/conf/AccessibleExecutorConfiguration.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/conf/AccessibleExecutorConfiguration.scala
@@@ -32,10 -32,10 +32,10 @@@ object AccessibleExecutorConfiguration
val ENGINECONN_LOG_SEND_TIME_INTERVAL = CommonVars("wds.linkis.engineconn.log.send.time.interval", 200)
- val ENGINECONN_LOG_SEND_SIZE = CommonVars[Int]("wds.linkis.engineconn.log.send.cache.size", 5)
+ val ENGINECONN_LOG_SEND_SIZE = CommonVars[Int]("wds.linkis.engineconn.log.send.cache.size", 300)
- val ENGINECONN_MAX_FREE_TIME = CommonVars("wds.linkis.engineconn.max.free.time", new TimeType("0.5h"))
+ val ENGINECONN_MAX_FREE_TIME = CommonVars("wds.linkis.engineconn.max.free.time", new TimeType("30m"))
val ENGINECONN_LOCK_CHECK_INTERVAL = CommonVars("wds.linkis.engineconn.lock.free.interval", new TimeType("3m"))
diff --cc linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/test/java/org/apache/linkis/datasource/client/TestDataSourceClient.scala
index 0000000,574c42c..574c42c
mode 000000,100644..100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/test/java/org/apache/linkis/datasource/client/TestDataSourceClient.scala
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/test/java/org/apache/linkis/datasource/client/TestDataSourceClient.scala
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 01/02: conflict resolution
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-udf
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 2dd2659238bbfa8cb0b819497e4a34ae90e652af
Author: peacewong <wp...@gmail.com>
AuthorDate: Fri Feb 18 20:28:56 2022 +0800
conflict resolution
---
.../linkis-datasource-client/pom.xml | 82 -----------------
.../datasource/client/AbstractRemoteClient.scala | 32 -------
.../datasource/client/DataSourceRemoteClient.scala | 38 --------
.../datasource/client/MetaDataRemoteClient.scala | 28 ------
.../linkis/datasource/client/RemoteClient.scala | 29 ------
.../client/config/DatasourceClientConfig.scala | 27 ------
.../DataSourceClientBuilderException.scala | 27 ------
.../client/impl/LinkisDataSourceRemoteClient.scala | 58 ------------
.../client/impl/LinkisMetaDataRemoteClient.scala | 37 --------
.../client/request/CreateDataSourceAction.scala | 68 --------------
.../client/request/DataSourceAction.scala | 22 -----
.../request/DataSourceTestConnectAction.scala | 77 ----------------
.../client/request/DeleteDataSourceAction.scala | 60 ------------
.../client/request/ExpireDataSourceAction.scala | 61 -------------
.../request/GetAllDataSourceTypesAction.scala | 50 ----------
.../GetConnectParamsByDataSourceIdAction.scala | 73 ---------------
.../GetConnectParamsByDataSourceNameAction.scala | 83 -----------------
.../request/GetDataSourceVersionsAction.scala | 61 -------------
.../request/GetInfoByDataSourceIdAction.scala | 71 ---------------
.../request/GetKeyTypeDatasourceAction.scala | 61 -------------
.../client/request/MetadataGetColumnsAction.scala | 91 -------------------
.../request/MetadataGetDatabasesAction.scala | 71 ---------------
.../request/MetadataGetPartitionsAction.scala | 89 ------------------
.../request/MetadataGetTablePropsAction.scala | 90 ------------------
.../client/request/MetadataGetTablesAction.scala | 79 ----------------
.../request/PublishDataSourceVersionAction.scala | 72 ---------------
.../client/request/QueryDataSourceAction.scala | 101 ---------------------
.../client/request/QueryDataSourceEnvAction.scala | 87 ------------------
.../client/request/UpdateDataSourceAction.scala | 81 -----------------
.../request/UpdateDataSourceParameterAction.scala | 80 ----------------
.../client/response/CreateDataSourceResult.scala | 27 ------
.../response/DataSourceTestConnectResult.scala | 28 ------
.../client/response/DeleteDataSourceResult.scala | 27 ------
.../client/response/ExpireDataSourceResult.scala | 27 ------
.../response/GetAllDataSourceTypesResult.scala | 40 --------
.../GetConnectParamsByDataSourceIdResult.scala | 27 ------
.../GetConnectParamsByDataSourceNameResult.scala | 27 ------
.../response/GetDataSourceVersionsResult.scala | 38 --------
.../response/GetInfoByDataSourceIdResult.scala | 34 -------
.../response/GetKeyTypeDatasourceResult.scala | 38 --------
.../client/response/MetadataGetColumnsResult.scala | 39 --------
.../response/MetadataGetDatabasesResult.scala | 28 ------
.../response/MetadataGetPartitionsResult.scala | 28 ------
.../response/MetadataGetTablePropsResult.scala | 28 ------
.../client/response/MetadataGetTablesResult.scala | 28 ------
.../response/PublishDataSourceVersionResult.scala | 25 -----
.../client/response/QueryDataSourceEnvResult.scala | 39 --------
.../client/response/QueryDataSourceResult.scala | 39 --------
.../response/UpdateDataSourceParameterResult.scala | 27 ------
.../client/response/UpdateDataSourceResult.scala | 27 ------
.../datasource/client/TestDataSourceClient.scala | 78 ----------------
.../datasourcemanager/common/DsmConfiguration.java | 27 ------
.../server/receiver/BaseMetaReceiver.scala | 67 --------------
53 files changed, 2679 deletions(-)
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/pom.xml
deleted file mode 100644
index 9bf502c..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/pom.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>linkis</artifactId>
- <groupId>org.apache.linkis</groupId>
- <version>1.0.3</version>
- <relativePath>../../../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>linkis-datasource-client</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-gateway-httpclient-support</artifactId>
- <version>${linkis.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-datasource-manager-common</artifactId>
- <version>${linkis.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-metadata-manager-common</artifactId>
- <version>${linkis.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/*.yml</exclude>
- <exclude>**/*.properties</exclude>
- <exclude>**/*.sh</exclude>
- <exclude>**/log4j2.xml</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
- <finalName>${project.artifactId}-${project.version}</finalName>
- </build>
-</project>
\ No newline at end of file
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/AbstractRemoteClient.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/AbstractRemoteClient.scala
deleted file mode 100644
index 3ace47b..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/AbstractRemoteClient.scala
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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
-
-import org.apache.linkis.httpclient.dws.DWSHttpClient
-import org.apache.linkis.httpclient.request.Action
-import org.apache.linkis.httpclient.response.Result
-
-abstract class AbstractRemoteClient extends RemoteClient {
- protected val dwsHttpClient:DWSHttpClient
-
- override def execute(action: Action): Result = action match {
- case action: Action => dwsHttpClient.execute(action)
- }
-
- override def close(): Unit = dwsHttpClient.close()
-}
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
deleted file mode 100644
index 65d5fda..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/DataSourceRemoteClient.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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
-
-import org.apache.linkis.datasource.client.request.{CreateDataSourceAction, DataSourceTestConnectAction, DeleteDataSourceAction, ExpireDataSourceAction, GetAllDataSourceTypesAction, GetConnectParamsByDataSourceIdAction, GetDataSourceVersionsAction, GetInfoByDataSourceIdAction, GetKeyTypeDatasourceAction, PublishDataSourceVersionAction, QueryDataSourceAction, QueryDataSourceEnvAction, UpdateDataSourceAction, UpdateDataSourceParameterAction}
-import org.apache.linkis.datasource.client.response.{CreateDataSourceResult, DataSourceTestConnectResult, DeleteDataSourceResult, ExpireDataSourceResult, GetAllDataSourceTypesResult, GetConnectParamsByDataSourceIdResult, GetDataSourceVersionsResult, GetInfoByDataSourceIdResult, GetKeyTypeDatasourceResult, PublishDataSourceVersionResult, QueryDataSourceEnvResult, QueryDataSourceResult, UpdateDataSourceParameterResult, UpdateDataSourceResult}
-
-trait DataSourceRemoteClient extends RemoteClient {
- def getAllDataSourceTypes(action: GetAllDataSourceTypesAction): GetAllDataSourceTypesResult
- def queryDataSourceEnv(action: QueryDataSourceEnvAction): QueryDataSourceEnvResult
- def getInfoByDataSourceId(action: GetInfoByDataSourceIdAction): GetInfoByDataSourceIdResult
- def queryDataSource(action: QueryDataSourceAction): QueryDataSourceResult
- def getConnectParams(action: GetConnectParamsByDataSourceIdAction): GetConnectParamsByDataSourceIdResult
- def createDataSource(action: CreateDataSourceAction): CreateDataSourceResult
- def getDataSourceTestConnect(action: DataSourceTestConnectAction): DataSourceTestConnectResult
- def deleteDataSource(action: DeleteDataSourceAction): DeleteDataSourceResult
- def expireDataSource(action: ExpireDataSourceAction): ExpireDataSourceResult
- def getDataSourceVersions(action: GetDataSourceVersionsAction): GetDataSourceVersionsResult
- def publishDataSourceVersion(action: PublishDataSourceVersionAction): PublishDataSourceVersionResult
- def updateDataSource(action: UpdateDataSourceAction): UpdateDataSourceResult
- def updateDataSourceParameter(action: UpdateDataSourceParameterAction): UpdateDataSourceParameterResult
- def getKeyDefinitionsByType(action: GetKeyTypeDatasourceAction): GetKeyTypeDatasourceResult
-}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/MetaDataRemoteClient.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/MetaDataRemoteClient.scala
deleted file mode 100644
index a630b89..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/MetaDataRemoteClient.scala
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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
-
-import org.apache.linkis.datasource.client.request.{MetadataGetColumnsAction, MetadataGetDatabasesAction, MetadataGetPartitionsAction, MetadataGetTablePropsAction, MetadataGetTablesAction}
-import org.apache.linkis.datasource.client.response.{MetadataGetColumnsResult, MetadataGetDatabasesResult, MetadataGetPartitionsResult, MetadataGetTablePropsResult, MetadataGetTablesResult}
-
-trait MetaDataRemoteClient extends RemoteClient {
- def getDatabases(action: MetadataGetDatabasesAction): MetadataGetDatabasesResult
- def getTables(action: MetadataGetTablesAction): MetadataGetTablesResult
- def getTableProps(action: MetadataGetTablePropsAction): MetadataGetTablePropsResult
- def getPartitions(action: MetadataGetPartitionsAction): MetadataGetPartitionsResult
- def getColumns(action: MetadataGetColumnsAction): MetadataGetColumnsResult
-}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/RemoteClient.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/RemoteClient.scala
deleted file mode 100644
index b024483..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/RemoteClient.scala
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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
-
-import org.apache.linkis.httpclient.request.Action
-import org.apache.linkis.httpclient.response.Result
-
-import java.io.Closeable
-
-trait RemoteClient extends Closeable {
- protected def execute(action: Action): Result
-
- override def close(): Unit
-}
\ No newline at end of file
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/config/DatasourceClientConfig.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/config/DatasourceClientConfig.scala
deleted file mode 100644
index c347edb..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/config/DatasourceClientConfig.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.config
-
-import org.apache.linkis.common.conf.CommonVars
-
-object DatasourceClientConfig {
- var METADATA_SERVICE_MODULE: CommonVars[String] = CommonVars.apply("wds.linkis.server.mdm.module.name", "metadatamanager")
-
- var DATA_SOURCE_SERVICE_MODULE: CommonVars[String] = CommonVars.apply("wds.linkis.server.dsm.module.name", "data-source-manager")
-
-}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/exception/DataSourceClientBuilderException.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/exception/DataSourceClientBuilderException.scala
deleted file mode 100644
index 89d32f9..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/exception/DataSourceClientBuilderException.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.exception
-
-import org.apache.linkis.common.exception.ErrorException
-
-class DataSourceClientBuilderException(errorDesc: String) extends ErrorException(31000, errorDesc) {
- def this(errorDesc: String, t: Throwable) = {
- this(errorDesc)
- super.initCause(t)
- }
-}
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
deleted file mode 100644
index 5a81252..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/impl/LinkisDataSourceRemoteClient.scala
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.impl
-
-import org.apache.linkis.datasource.client.request.{CreateDataSourceAction, DataSourceTestConnectAction, DeleteDataSourceAction, ExpireDataSourceAction, GetAllDataSourceTypesAction, GetConnectParamsByDataSourceIdAction, GetDataSourceVersionsAction, GetInfoByDataSourceIdAction, GetKeyTypeDatasourceAction, PublishDataSourceVersionAction, QueryDataSourceAction, QueryDataSourceEnvAction, UpdateDataSourceAction, UpdateDataSourceParameterAction}
-import org.apache.linkis.datasource.client.response.{CreateDataSourceResult, DataSourceTestConnectResult, DeleteDataSourceResult, ExpireDataSourceResult, GetAllDataSourceTypesResult, GetConnectParamsByDataSourceIdResult, GetDataSourceVersionsResult, GetInfoByDataSourceIdResult, GetKeyTypeDatasourceResult, PublishDataSourceVersionResult, QueryDataSourceEnvResult, QueryDataSourceResult, UpdateDataSourceParameterResult, UpdateDataSourceResult}
-import org.apache.linkis.datasource.client.{AbstractRemoteClient, DataSourceRemoteClient}
-import org.apache.linkis.httpclient.dws.DWSHttpClient
-import org.apache.linkis.httpclient.dws.config.DWSClientConfig
-
-
-class LinkisDataSourceRemoteClient(clientConfig: DWSClientConfig) extends AbstractRemoteClient with DataSourceRemoteClient {
- protected override val dwsHttpClient = new DWSHttpClient(clientConfig, "DataSource-Client")
-
- override def getAllDataSourceTypes(action: GetAllDataSourceTypesAction): GetAllDataSourceTypesResult = execute(action).asInstanceOf[GetAllDataSourceTypesResult]
-
- override def queryDataSourceEnv(action: QueryDataSourceEnvAction): QueryDataSourceEnvResult = execute(action).asInstanceOf[QueryDataSourceEnvResult]
-
- override def getInfoByDataSourceId(action: GetInfoByDataSourceIdAction): GetInfoByDataSourceIdResult = execute(action).asInstanceOf[GetInfoByDataSourceIdResult]
-
- override def queryDataSource(action: QueryDataSourceAction): QueryDataSourceResult = execute(action).asInstanceOf[QueryDataSourceResult]
-
- override def getConnectParams(action: GetConnectParamsByDataSourceIdAction): GetConnectParamsByDataSourceIdResult = execute(action).asInstanceOf[GetConnectParamsByDataSourceIdResult]
-
- override def createDataSource(action: CreateDataSourceAction): CreateDataSourceResult = execute(action).asInstanceOf[CreateDataSourceResult]
-
- override def getDataSourceTestConnect(action: DataSourceTestConnectAction): DataSourceTestConnectResult = execute(action).asInstanceOf[DataSourceTestConnectResult]
-
- override def deleteDataSource(action: DeleteDataSourceAction): DeleteDataSourceResult = execute(action).asInstanceOf[DeleteDataSourceResult]
-
- override def expireDataSource(action: ExpireDataSourceAction): ExpireDataSourceResult = execute(action).asInstanceOf[ExpireDataSourceResult]
-
- override def getDataSourceVersions(action: GetDataSourceVersionsAction): GetDataSourceVersionsResult = execute(action).asInstanceOf[GetDataSourceVersionsResult]
-
- override def publishDataSourceVersion(action: PublishDataSourceVersionAction): PublishDataSourceVersionResult = execute(action).asInstanceOf[PublishDataSourceVersionResult]
-
- override def updateDataSource(action: UpdateDataSourceAction): UpdateDataSourceResult = execute(action).asInstanceOf[UpdateDataSourceResult]
-
- override def updateDataSourceParameter(action: UpdateDataSourceParameterAction): UpdateDataSourceParameterResult = execute(action).asInstanceOf[UpdateDataSourceParameterResult]
-
- override def getKeyDefinitionsByType(action: GetKeyTypeDatasourceAction): GetKeyTypeDatasourceResult = execute(action).asInstanceOf[GetKeyTypeDatasourceResult]
-}
-
-
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/impl/LinkisMetaDataRemoteClient.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/impl/LinkisMetaDataRemoteClient.scala
deleted file mode 100644
index eef50c5..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/impl/LinkisMetaDataRemoteClient.scala
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.impl
-
-import org.apache.linkis.datasource.client.request.{MetadataGetColumnsAction, MetadataGetDatabasesAction, MetadataGetPartitionsAction, MetadataGetTablePropsAction, MetadataGetTablesAction}
-import org.apache.linkis.datasource.client.response.{MetadataGetColumnsResult, MetadataGetDatabasesResult, MetadataGetPartitionsResult, MetadataGetTablePropsResult, MetadataGetTablesResult}
-import org.apache.linkis.datasource.client.{AbstractRemoteClient, MetaDataRemoteClient}
-import org.apache.linkis.httpclient.dws.DWSHttpClient
-import org.apache.linkis.httpclient.dws.config.DWSClientConfig
-
-class LinkisMetaDataRemoteClient(clientConfig: DWSClientConfig) extends AbstractRemoteClient with MetaDataRemoteClient {
- protected override val dwsHttpClient = new DWSHttpClient(clientConfig, "MetaData-Client")
-
- override def getDatabases(action: MetadataGetDatabasesAction): MetadataGetDatabasesResult = execute(action).asInstanceOf[MetadataGetDatabasesResult]
-
- override def getTables(action: MetadataGetTablesAction): MetadataGetTablesResult = execute(action).asInstanceOf[MetadataGetTablesResult]
-
- override def getTableProps(action: MetadataGetTablePropsAction): MetadataGetTablePropsResult = execute(action).asInstanceOf[MetadataGetTablePropsResult]
-
- override def getPartitions(action: MetadataGetPartitionsAction): MetadataGetPartitionsResult = execute(action).asInstanceOf[MetadataGetPartitionsResult]
-
- override def getColumns(action: MetadataGetColumnsAction): MetadataGetColumnsResult = execute(action).asInstanceOf[MetadataGetColumnsResult]
-}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/CreateDataSourceAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/CreateDataSourceAction.scala
deleted file mode 100644
index f4ece29..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/CreateDataSourceAction.scala
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * 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._
-import org.apache.linkis.httpclient.dws.DWSHttpClient
-import org.apache.linkis.httpclient.request.POSTAction
-
-import java.util
-import scala.collection.JavaConverters._
-
-class CreateDataSourceAction extends POSTAction with DataSourceAction{
- override def getRequestPayload: String = DWSHttpClient.jacksonJson.writeValueAsString(getRequestPayloads)
-
- private var user: String = _
-
- override def setUser(user: String): Unit = this.user = user
-
- override def getUser: String = this.user
-
- override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "info", "json")
-}
-object CreateDataSourceAction {
- def builder(): Builder = new Builder
-
- class Builder private[CreateDataSourceAction]() {
- private var user: String = _
- private var payload: util.Map[String, Any] = new util.HashMap[String, Any]()
-
- def setUser(user: String): Builder = {
- this.user = user
- this
- }
-
- def addRequestPayload(key: String, value: Any): Builder = {
- if (value != null) this.payload.put(key, value)
- this
- }
-
- def addRequestPayloads(map: util.Map[String, Any]): Builder = {
- this.synchronized(this.payload = map)
- this
- }
-
- def build(): CreateDataSourceAction = {
- val action = new CreateDataSourceAction
- action.setUser(user)
- this.payload.asScala.foreach(k => {
- action.addRequestPayload(k._1, k._2)
- })
- action
- }
- }
-}
\ No newline at end of file
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceAction.scala
deleted file mode 100644
index 9defeb2..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceAction.scala
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * 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.httpclient.dws.request.DWSHttpAction
-
-trait DataSourceAction extends DWSHttpAction with org.apache.linkis.httpclient.request.UserAction
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceTestConnectAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceTestConnectAction.scala
deleted file mode 100644
index 0444b4c..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceTestConnectAction.scala
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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._
-import org.apache.linkis.datasource.client.exception.DataSourceClientBuilderException
-import org.apache.linkis.httpclient.dws.DWSHttpClient
-import org.apache.linkis.httpclient.request.PutAction
-
-class DataSourceTestConnectAction private() extends PutAction with DataSourceAction {
- private var user: String = _
-
- private var dataSourceId: String = _
-
- private var version: String = _
-
- override def setUser(user: String): Unit = this.user = user
-
- override def getUser: String = this.user
-
- override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, dataSourceId, version, "op", "connect")
-
- override def getRequestPayload: String = DWSHttpClient.jacksonJson.writeValueAsString(getRequestPayloads)
-}
-object DataSourceTestConnectAction {
- def builder(): Builder = new Builder
-
- class Builder private[DataSourceTestConnectAction]() {
- private var user: String = _
- private var dataSourceId: String = _
- private var version: String = _
-
- def setUser(user: String): Builder = {
- this.user = user
- this
- }
-
- def setDataSourceId(dataSourceId: String): Builder = {
- this.dataSourceId = dataSourceId
- this
- }
-
- def setVersion(version: String): Builder = {
- this.version = version
- this
- }
-
- def build(): DataSourceTestConnectAction = {
- if (dataSourceId == null) throw new DataSourceClientBuilderException("dataSourceId is needed!")
- if(version == null) throw new DataSourceClientBuilderException("version is needed!")
- if(user == null) throw new DataSourceClientBuilderException("user is needed!")
-
- val action = new DataSourceTestConnectAction()
- action.dataSourceId = dataSourceId
- action.version = version
- action.user = user
-
- action
- }
- }
-}
-
-
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DeleteDataSourceAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DeleteDataSourceAction.scala
deleted file mode 100644
index f3e230f..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DeleteDataSourceAction.scala
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * 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._
-import org.apache.linkis.datasource.client.exception.DataSourceClientBuilderException
-import org.apache.linkis.httpclient.request.DeleteAction
-
-class DeleteDataSourceAction extends DeleteAction with DataSourceAction {
- private var user: String = _
-
- private var resourceId: String = _
-
- override def setUser(user: String): Unit = this.user = user
-
- override def getUser: String = this.user
-
- override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "info", resourceId)
-}
-object DeleteDataSourceAction{
- def builder(): Builder = new Builder
- class Builder private[DeleteDataSourceAction]() {
- private var user: String = _
- private var resourceId: String = _
-
- def setUser(user: String): Builder = {
- this.user = user
- this
- }
-
- def setResourceId(resourceId: String): Builder = {
- this.resourceId = resourceId
- this
- }
-
- def builder(): DeleteDataSourceAction = {
- if (user == null) throw new DataSourceClientBuilderException("user is needed!")
- if(resourceId == null) throw new DataSourceClientBuilderException("resourceId is needed!")
-
- val action = new DeleteDataSourceAction
- action.user = user
- action.resourceId = resourceId
- action
- }
- }
-}
\ No newline at end of file
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/ExpireDataSourceAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/ExpireDataSourceAction.scala
deleted file mode 100644
index 73e64ed..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/ExpireDataSourceAction.scala
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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._
-import org.apache.linkis.datasource.client.exception.DataSourceClientBuilderException
-import org.apache.linkis.httpclient.request.PutAction
-
-class ExpireDataSourceAction extends PutAction with DataSourceAction {
- override def getRequestPayload: String = ""
-
- private var user: String = _
-
- private var dataSourceId: String = _
-
- override def setUser(user: String): Unit = this.user = user
-
- override def getUser: String = this.user
-
- override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "info", dataSourceId, "expire")
-}
-object ExpireDataSourceAction{
- def builder(): Builder = new Builder
- class Builder private[ExpireDataSourceAction]() {
- private var user: String = _
- private var dataSourceId: String = _
-
- def setUser(user: String): Builder = {
- this.user = user
- this
- }
-
- def setDataSourceId(dataSourceId: String): Builder = {
- this.dataSourceId = dataSourceId
- this
- }
- def build(): ExpireDataSourceAction = {
- if (dataSourceId == null) throw new DataSourceClientBuilderException("dataSourceId is needed!")
- if(user == null) throw new DataSourceClientBuilderException("user is needed!")
-
- val action = new ExpireDataSourceAction()
- action.dataSourceId = dataSourceId
- action.user = user
- action
- }
- }
-}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetAllDataSourceTypesAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetAllDataSourceTypesAction.scala
deleted file mode 100644
index df72e1e..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetAllDataSourceTypesAction.scala
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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._
-import org.apache.linkis.httpclient.request.GetAction
-
-class GetAllDataSourceTypesAction extends GetAction with DataSourceAction {
- override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "type", "all")
-
- private var user: String = _
-
- override def setUser(user: String): Unit = this.user = user
-
- override def getUser: String = this.user
-}
-
-object GetAllDataSourceTypesAction {
- def builder(): Builder = new Builder
-
- class Builder private[GetAllDataSourceTypesAction]() {
- private var user: String = _
-
- def setUser(user: String): Builder = {
- this.user = user
- this
- }
-
- def build(): GetAllDataSourceTypesAction = {
- val action = new GetAllDataSourceTypesAction
- action.setUser(user)
-
- action
- }
- }
-}
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
deleted file mode 100644
index 0ce93fa..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceIdAction.scala
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * 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._
-import org.apache.linkis.datasource.client.exception.DataSourceClientBuilderException
-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")
-
- private var user: String = _
-
- override def setUser(user: String): Unit = this.user = user
-
- override def getUser: String = this.user
-}
-
-
-object GetConnectParamsByDataSourceIdAction {
- def builder(): Builder = new Builder
-
- class Builder private[GetConnectParamsByDataSourceIdAction]() {
- private var dataSourceId: Long = _
- private var system: String = _
- private var user: String = _
-
- def setUser(user: String): Builder = {
- this.user = user
- this
- }
-
- def setDataSourceId(dataSourceId: Long): Builder = {
- this.dataSourceId = dataSourceId
- this
- }
-
- def setSystem(system: String): Builder = {
- this.system = system
- this
- }
-
- def build(): GetConnectParamsByDataSourceIdAction = {
- if (dataSourceId == null) throw new DataSourceClientBuilderException("dataSourceId is needed!")
- if(system == null) throw new DataSourceClientBuilderException("system is needed!")
- if(user == null) throw new DataSourceClientBuilderException("user is needed!")
-
- val getConnectParamsByDataSourceIdAction = new GetConnectParamsByDataSourceIdAction
- getConnectParamsByDataSourceIdAction.dataSourceId = this.dataSourceId
- getConnectParamsByDataSourceIdAction.setParameter("system", system)
- getConnectParamsByDataSourceIdAction.setUser(user)
- getConnectParamsByDataSourceIdAction
- }
- }
-
-}
-
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
deleted file mode 100644
index 43184ba..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceNameAction.scala
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * 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 java.net.URLEncoder
-import java.nio.charset.StandardCharsets
-
-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
-
-/**
- * Get version parameters from data source
- */
-class GetConnectParamsByDataSourceNameAction extends GetAction with DataSourceAction{
- private var dataSourceName: String = _
-
- private var user: String = _
-
- override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "name", dataSourceName, "connect_params")
-
- override def setUser(user: String): Unit = this.user = user
-
- override def getUser: String = user
-}
-
-object GetConnectParamsByDataSourceNameAction{
- def builder(): Builder = new Builder
-
- class Builder private[GetConnectParamsByDataSourceNameAction]() {
- 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(): GetConnectParamsByDataSourceNameAction = {
- if (dataSourceName == null) throw new DataSourceClientBuilderException("dataSourceId is needed!")
- if(system == null) throw new DataSourceClientBuilderException("system is needed!")
- if(user == null) throw new DataSourceClientBuilderException("user is needed!")
- // Use URIEncoder to encode the datSourceName
- var requestDataSourceName = this.dataSourceName
- try {
- requestDataSourceName = URLEncoder.encode(dataSourceName, StandardCharsets.UTF_8.name())
- } catch {
- case e: Exception =>
- throw new DataSourceClientBuilderException(s"Cannot encode the name of data source:[$dataSourceName] for request", e)
- }
- val getConnectParamsByDataSourceNameAction = new GetConnectParamsByDataSourceNameAction
- getConnectParamsByDataSourceNameAction.dataSourceName = requestDataSourceName
- getConnectParamsByDataSourceNameAction.setParameter("system", system)
- getConnectParamsByDataSourceNameAction.setUser(user)
- getConnectParamsByDataSourceNameAction
- }
- }
-}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetDataSourceVersionsAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetDataSourceVersionsAction.scala
deleted file mode 100644
index a520e42..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetDataSourceVersionsAction.scala
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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._
-import org.apache.linkis.datasource.client.exception.DataSourceClientBuilderException
-import org.apache.linkis.httpclient.request.GetAction
-
-class GetDataSourceVersionsAction extends GetAction with DataSourceAction {
- private var user: String = _
- private var resourceId: String = _
-
- override def setUser(user: String): Unit = this.user = user
-
- override def getUser: String = this.user
-
- override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, resourceId, "versions")
-}
-object GetDataSourceVersionsAction {
- def builder(): Builder = new Builder
-
- class Builder private[GetDataSourceVersionsAction]() {
- private var user: String = _
- private var resourceId: String = _
-
- def setUser(user: String): Builder = {
- this.user = user
- this
- }
-
- def setResourceId(resourceId: String): Builder = {
- this.resourceId = resourceId
- this
- }
-
- def build(): GetDataSourceVersionsAction = {
- if (resourceId == null) throw new DataSourceClientBuilderException("resourceId is needed!")
- if(user == null) throw new DataSourceClientBuilderException("user is needed!")
-
- val action = new GetDataSourceVersionsAction
- action.user = user
- action.resourceId = resourceId
-
- action
- }
- }
-}
\ No newline at end of file
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoByDataSourceIdAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoByDataSourceIdAction.scala
deleted file mode 100644
index 7d242e5..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoByDataSourceIdAction.scala
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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._
-import org.apache.linkis.datasource.client.exception.DataSourceClientBuilderException
-import org.apache.linkis.httpclient.request.GetAction
-
-class GetInfoByDataSourceIdAction extends GetAction with DataSourceAction {
- private var dataSourceId: Long = _
-
- override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "info", dataSourceId.toString)
-
- private var user: String = _
-
- override def setUser(user: String): Unit = this.user = user
-
- override def getUser: String = this.user
-}
-
-object GetInfoByDataSourceIdAction {
- def builder(): Builder = new Builder
-
- class Builder private[GetInfoByDataSourceIdAction]() {
- private var dataSourceId: Long = _
- private var system: String = _
- private var user: String = _
-
- def setUser(user: String): Builder = {
- this.user = user
- this
- }
-
- def setDataSourceId(dataSourceId: Long): Builder = {
- this.dataSourceId = dataSourceId
- this
- }
-
- def setSystem(system: String): Builder = {
- this.system = system
- this
- }
-
- def build(): GetInfoByDataSourceIdAction = {
- if (dataSourceId == null) throw new DataSourceClientBuilderException("dataSourceId is needed!")
- if(system == null) throw new DataSourceClientBuilderException("system is needed!")
- if(user == null) throw new DataSourceClientBuilderException("user is needed!")
-
- val getInfoByDataSourceIdAction = new GetInfoByDataSourceIdAction
- getInfoByDataSourceIdAction.dataSourceId = this.dataSourceId
- getInfoByDataSourceIdAction.setParameter("system", system)
- getInfoByDataSourceIdAction.setUser(user)
- getInfoByDataSourceIdAction
- }
- }
-
-}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetKeyTypeDatasourceAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetKeyTypeDatasourceAction.scala
deleted file mode 100644
index 442ce80..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetKeyTypeDatasourceAction.scala
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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 GetKeyTypeDatasourceAction extends GetAction with DataSourceAction{
- private var dataSourceTypeId: Long = _
-
- override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "key_define", "type", dataSourceTypeId.toString)
-
- private var user: String = _
-
- override def setUser(user: String): Unit = this.user = user
-
- override def getUser: String = this.user
-}
-object GetKeyTypeDatasourceAction{
- def builder(): Builder = new Builder
-
- class Builder private[GetKeyTypeDatasourceAction]() {
- private var dataSourceTypeId: Long = _
- private var user: String = _
-
- def setUser(user: String): Builder = {
- this.user = user
- this
- }
-
- def setDataSourceTypeId(dataSourceTypeId: Long): Builder = {
- this.dataSourceTypeId = dataSourceTypeId
- this
- }
-
- def build(): GetKeyTypeDatasourceAction = {
- if (user == null) throw new DataSourceClientBuilderException("user is needed!")
-
- val getKeyTypeDatasourceAction = new GetKeyTypeDatasourceAction
- getKeyTypeDatasourceAction.dataSourceTypeId = this.dataSourceTypeId
- getKeyTypeDatasourceAction.setUser(user)
- getKeyTypeDatasourceAction
- }
- }
-}
-
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetColumnsAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetColumnsAction.scala
deleted file mode 100644
index 8fe3eb7..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetColumnsAction.scala
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * 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._
-import org.apache.linkis.datasource.client.exception.DataSourceClientBuilderException
-import org.apache.linkis.httpclient.request.GetAction
-
-class MetadataGetColumnsAction extends GetAction with DataSourceAction {
- private var dataSourceId: Long = _
- private var database: String = _
- private var table: String = _
-
- override def suffixURLs: Array[String] = Array(METADATA_SERVICE_MODULE.getValue, "columns", dataSourceId.toString, "db", database, "table", table)
-
- private var user: String = _
-
- override def setUser(user: String): Unit = this.user = user
-
- override def getUser: String = this.user
-}
-
-
-object MetadataGetColumnsAction {
- def builder(): Builder = new Builder
-
- class Builder private[MetadataGetColumnsAction]() {
- private var dataSourceId: Long = _
- private var database: String = _
- private var table: String = _
- private var system: String = _
- private var user: String = _
-
- def setUser(user: String): Builder = {
- this.user = user
- this
- }
-
- def setDataSourceId(dataSourceId: Long): Builder = {
- this.dataSourceId = dataSourceId
- this
- }
-
- def setDatabase(database: String): Builder = {
- this.database = database
- this
- }
-
- def setTable(table: String): Builder = {
- this.table = table
- this
- }
-
- def setSystem(system: String): Builder = {
- this.system = system
- this
- }
-
- def build(): MetadataGetColumnsAction = {
- if (dataSourceId == null) throw new DataSourceClientBuilderException("dataSourceId is needed!")
- if(database == null) throw new DataSourceClientBuilderException("database is needed!")
- if(table == null) throw new DataSourceClientBuilderException("table is needed!")
- if(system == null) throw new DataSourceClientBuilderException("system is needed!")
- if(user == null) throw new DataSourceClientBuilderException("user is needed!")
-
-
- val metadataGetColumnsAction = new MetadataGetColumnsAction
- metadataGetColumnsAction.dataSourceId = this.dataSourceId
- metadataGetColumnsAction.database = this.database
- metadataGetColumnsAction.table = this.table
- metadataGetColumnsAction.setParameter("system", system)
- metadataGetColumnsAction.setUser(user)
- metadataGetColumnsAction
- }
- }
-
-}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetDatabasesAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetDatabasesAction.scala
deleted file mode 100644
index bc960dc..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetDatabasesAction.scala
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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._
-import org.apache.linkis.datasource.client.exception.DataSourceClientBuilderException
-import org.apache.linkis.httpclient.request.GetAction
-
-class MetadataGetDatabasesAction extends GetAction with DataSourceAction {
- private var dataSourceId: Long = _
-
- override def suffixURLs: Array[String] = Array(METADATA_SERVICE_MODULE.getValue, "dbs", dataSourceId.toString)
-
- private var user: String = _
-
- override def setUser(user: String): Unit = this.user = user
-
- override def getUser: String = this.user
-}
-
-object MetadataGetDatabasesAction {
- def builder(): Builder = new Builder
-
- class Builder private[MetadataGetDatabasesAction]() {
- private var dataSourceId: Long = _
- private var system: String = _
- private var user: String = _
-
- def setUser(user: String): Builder = {
- this.user = user
- this
- }
-
- def setDataSourceId(dataSourceId: Long): Builder = {
- this.dataSourceId = dataSourceId
- this
- }
-
- def setSystem(system: String): Builder = {
- this.system = system
- this
- }
-
- def build(): MetadataGetDatabasesAction = {
- if (dataSourceId == null) throw new DataSourceClientBuilderException("dataSourceId is needed!")
- if(system == null) throw new DataSourceClientBuilderException("system is needed!")
- if(user == null) throw new DataSourceClientBuilderException("user is needed!")
-
- val metadataGetDatabasesAction = new MetadataGetDatabasesAction
- metadataGetDatabasesAction.dataSourceId = this.dataSourceId
- metadataGetDatabasesAction.setParameter("system", system)
- metadataGetDatabasesAction.setUser(user)
- metadataGetDatabasesAction
- }
- }
-
-}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetPartitionsAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetPartitionsAction.scala
deleted file mode 100644
index 2e0b5cb..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetPartitionsAction.scala
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * 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._
-import org.apache.linkis.datasource.client.exception.DataSourceClientBuilderException
-import org.apache.linkis.httpclient.request.GetAction
-
-class MetadataGetPartitionsAction extends GetAction with DataSourceAction {
- private var dataSourceId: String = _
- private var database: String = _
- private var table: String = _
-
- override def suffixURLs: Array[String] = Array(METADATA_SERVICE_MODULE.getValue, "partitions", dataSourceId, "db", database, "table", table)
-
- private var user: String = _
-
- override def setUser(user: String): Unit = this.user = user
-
- override def getUser: String = this.user
-}
-
-
-object MetadataGetPartitionsAction {
- def builder(): Builder = new Builder
-
- class Builder private[MetadataGetPartitionsAction]() {
- private var dataSourceId: String = _
- private var database: String = _
- private var table: String = _
- private var system: String = _
- private var user: String = _
-
- def setUser(user: String): Builder = {
- this.user = user
- this
- }
-
- def setDataSourceId(dataSourceId: String): Builder = {
- this.dataSourceId = dataSourceId
- this
- }
-
- def setDatabase(database: String): Builder = {
- this.database = database
- this
- }
-
- def setTable(table: String): Builder = {
- this.table = table
- this
- }
-
- def setSystem(system: String): Builder = {
- this.system = system
- this
- }
-
- def build(): MetadataGetPartitionsAction = {
- if (dataSourceId == null) throw new DataSourceClientBuilderException("dataSourceId is needed!")
- if(database == null) throw new DataSourceClientBuilderException("database is needed!")
- if(table == null) throw new DataSourceClientBuilderException("table is needed!")
- if(system == null) throw new DataSourceClientBuilderException("system is needed!")
-
- val metadataGetPartitionsAction = new MetadataGetPartitionsAction
- metadataGetPartitionsAction.dataSourceId = this.dataSourceId
- metadataGetPartitionsAction.database = this.database
- metadataGetPartitionsAction.table = this.table
- metadataGetPartitionsAction.setParameter("system", system)
- metadataGetPartitionsAction.setUser(user)
- metadataGetPartitionsAction
- }
- }
-
-}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablePropsAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablePropsAction.scala
deleted file mode 100644
index c83875b..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablePropsAction.scala
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * 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._
-import org.apache.linkis.datasource.client.exception.DataSourceClientBuilderException
-import org.apache.linkis.httpclient.request.GetAction
-
-class MetadataGetTablePropsAction extends GetAction with DataSourceAction {
- private var dataSourceId: Long = _
- private var database: String = _
- private var table: String = _
-
- override def suffixURLs: Array[String] = Array(METADATA_SERVICE_MODULE.getValue, "props", dataSourceId.toString, "db", database, "table", table)
-
- private var user: String = _
-
- override def setUser(user: String): Unit = this.user = user
-
- override def getUser: String = this.user
-}
-
-object MetadataGetTablePropsAction {
- def builder(): Builder = new Builder
-
- class Builder private[MetadataGetTablePropsAction]() {
- private var dataSourceId: Long = _
- private var database: String = _
- private var table: String = _
- private var system: String = _
- private var user: String = _
-
- def setUser(user: String): Builder = {
- this.user = user
- this
- }
-
- def setDataSourceId(dataSourceId: Long): Builder = {
- this.dataSourceId = dataSourceId
- this
- }
-
- def setDatabase(database: String): Builder = {
- this.database = database
- this
- }
-
- def setTable(table: String): Builder = {
- this.table = table
- this
- }
-
- def setSystem(system: String): Builder = {
- this.system = system
- this
- }
-
- def build(): MetadataGetTablePropsAction = {
- if (dataSourceId == null) throw new DataSourceClientBuilderException("dataSourceId is needed!")
- if(database == null) throw new DataSourceClientBuilderException("database is needed!")
- if(table == null) throw new DataSourceClientBuilderException("table is needed!")
- if(system == null) throw new DataSourceClientBuilderException("system is needed!")
- if(user == null) throw new DataSourceClientBuilderException("user is needed!")
-
- val metadataGetTablePropsAction = new MetadataGetTablePropsAction
- metadataGetTablePropsAction.dataSourceId = this.dataSourceId
- metadataGetTablePropsAction.database = this.database
- metadataGetTablePropsAction.table = this.table
- metadataGetTablePropsAction.setParameter("system", system)
- metadataGetTablePropsAction.setUser(user)
- metadataGetTablePropsAction
- }
- }
-
-}
-
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablesAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablesAction.scala
deleted file mode 100644
index a35192e..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablesAction.scala
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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._
-import org.apache.linkis.datasource.client.exception.DataSourceClientBuilderException
-import org.apache.linkis.httpclient.request.GetAction
-
-class MetadataGetTablesAction extends GetAction with DataSourceAction {
- private var dataSourceId: Long = _
- private var database: String = _
-
- override def suffixURLs: Array[String] = Array(METADATA_SERVICE_MODULE.getValue, "tables", dataSourceId.toString, "db", database)
-
- private var user: String = _
-
- override def setUser(user: String): Unit = this.user = user
-
- override def getUser: String = this.user
-}
-
-object MetadataGetTablesAction {
- def builder(): Builder = new Builder
-
- class Builder private[MetadataGetTablesAction]() {
- private var dataSourceId: Long = _
- private var database: String = _
- private var system: String = _
- private var user: String = _
-
- def setUser(user: String): Builder = {
- this.user = user
- this
- }
- def setDataSourceId(dataSourceId: Long): Builder = {
- this.dataSourceId = dataSourceId
- this
- }
-
- def setDatabase(database: String): Builder = {
- this.database = database
- this
- }
-
- def setSystem(system: String): Builder = {
- this.system = system
- this
- }
-
- def build(): MetadataGetTablesAction = {
- if (dataSourceId == null) throw new DataSourceClientBuilderException("dataSourceId is needed!")
- if(database == null) throw new DataSourceClientBuilderException("database is needed!")
- if(system == null) throw new DataSourceClientBuilderException("system is needed!")
- if(user == null) throw new DataSourceClientBuilderException("user is needed!")
-
- val metadataGetTablesAction = new MetadataGetTablesAction
- metadataGetTablesAction.dataSourceId = this.dataSourceId
- metadataGetTablesAction.database = this.database
- metadataGetTablesAction.setParameter("system", system)
- metadataGetTablesAction.setUser(user)
- metadataGetTablesAction
- }
- }
-
-}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/PublishDataSourceVersionAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/PublishDataSourceVersionAction.scala
deleted file mode 100644
index 9735ea9..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/PublishDataSourceVersionAction.scala
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * 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._
-import org.apache.linkis.datasource.client.exception.DataSourceClientBuilderException
-import org.apache.linkis.httpclient.dws.DWSHttpClient
-import org.apache.linkis.httpclient.request.POSTAction
-
-class PublishDataSourceVersionAction extends POSTAction with DataSourceAction{
- override def getRequestPayload: String = DWSHttpClient.jacksonJson.writeValueAsString(getRequestPayloads)
- private var user: String = _
- private var dataSourceId: String = _
- private var versionId: String = _
-
- override def setUser(user: String): Unit = this.user = user
-
- override def getUser: String = this.user
-
- override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "publish", dataSourceId, versionId)
-}
-object PublishDataSourceVersionAction {
- def builder(): Builder = new Builder
-
- class Builder private[PublishDataSourceVersionAction]() {
- private var user: String = _
- private var dataSourceId: String = _
- private var versionId: String = _
-
- def setUser(user: String): Builder = {
- this.user = user
- this
- }
-
- def setDataSourceId(dataSourceId: String): Builder = {
- this.dataSourceId = dataSourceId
- this
- }
-
- def setVersion(versionId: String): Builder = {
- this.versionId = versionId
- this
- }
-
- def build(): PublishDataSourceVersionAction = {
- if (dataSourceId == null) throw new DataSourceClientBuilderException("dataSourceId is needed!")
- if(versionId == null) throw new DataSourceClientBuilderException("versionId is needed!")
- if(user == null) throw new DataSourceClientBuilderException("user is needed!")
-
- val action = new PublishDataSourceVersionAction()
- action.dataSourceId = dataSourceId
- action.versionId = versionId
- action.user = user
-
- action
- }
- }
-}
\ No newline at end of file
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceAction.scala
deleted file mode 100644
index b64879e..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceAction.scala
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * 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._
-import org.apache.linkis.datasource.client.exception.DataSourceClientBuilderException
-import org.apache.linkis.httpclient.request.GetAction
-
-class QueryDataSourceAction extends GetAction with DataSourceAction{
- override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "info")
-
- private var user: String = _
-
- override def setUser(user: String): Unit = this.user = user
-
- override def getUser: String = this.user
-}
-
-object QueryDataSourceAction {
- def builder(): Builder = new Builder
-
- class Builder private[QueryDataSourceAction]() {
- private var system: String = _
- private var name: String = _
- private var typeId: Long = _
- private var identifies: String = _
- private var currentPage: Integer = _
- private var pageSize: Integer = _
- private var user: String = _
-
- def setUser(user: String): Builder = {
- this.user = user
- this
- }
-
- def setSystem(system: String): Builder = {
- this.system = system
- this
- }
-
- def setName(name: String): Builder = {
- this.name = name
- this
- }
-
- def setTypeId(typeId: Long): Builder = {
- this.typeId = typeId
- this
- }
-
- def setIdentifies(identifies: String): Builder = {
- this.identifies = identifies
- this
- }
-
- def setCurrentPage(currentPage: Integer): Builder = {
- this.currentPage = currentPage
- this
- }
-
- def setPageSize(pageSize: Integer): Builder = {
- this.pageSize = pageSize
- this
- }
-
- def build(): QueryDataSourceAction = {
- if (system == null) throw new DataSourceClientBuilderException("system is needed!")
- if(name == null) throw new DataSourceClientBuilderException("name is needed!")
- if(typeId == null) throw new DataSourceClientBuilderException("typeId is needed!")
- if(identifies == null) throw new DataSourceClientBuilderException("identifies is needed!")
- if(currentPage == null) throw new DataSourceClientBuilderException("currentPage is needed!")
- if(pageSize == null) throw new DataSourceClientBuilderException("pageSize is needed!")
- if(user == null) throw new DataSourceClientBuilderException("user is needed!")
-
- val queryDataSourceAction = new QueryDataSourceAction
- queryDataSourceAction.setParameter("system", system)
- queryDataSourceAction.setParameter("name", name)
- queryDataSourceAction.setParameter("typeId", typeId)
- queryDataSourceAction.setParameter("identifies", identifies)
- queryDataSourceAction.setParameter("currentPage", currentPage)
- queryDataSourceAction.setParameter("pageSize", pageSize)
- queryDataSourceAction.setUser(user)
-
- queryDataSourceAction
- }
- }
-}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceEnvAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceEnvAction.scala
deleted file mode 100644
index 834b7ef..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceEnvAction.scala
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * 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._
-import org.apache.linkis.datasource.client.exception.DataSourceClientBuilderException
-import org.apache.linkis.httpclient.request.GetAction
-
-class QueryDataSourceEnvAction extends GetAction with DataSourceAction{
- override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "env")
-
- private var user: String = _
-
- override def setUser(user: String): Unit = this.user = user
-
- override def getUser: String = this.user
-}
-
-
-object QueryDataSourceEnvAction {
- def builder(): Builder = new Builder
-
- class Builder private[QueryDataSourceEnvAction]() {
- private var name: String = _
- private var typeId: Long = _
- private var currentPage: Integer = _
- private var pageSize: Integer = _
- private var user: String = _
-
- def setUser(user: String): Builder = {
- this.user = user
- this
- }
-
- def setName(name: String): Builder = {
- this.name = name
- this
- }
-
- def setTypeId(typeId: Long): Builder = {
- this.typeId = typeId
- this
- }
-
- def setCurrentPage(currentPage: Integer): Builder = {
- this.currentPage = currentPage
- this
- }
-
- def setPageSize(pageSize: Integer): Builder = {
- this.pageSize = pageSize
- this
- }
-
- def build(): QueryDataSourceEnvAction = {
- if (name == null) throw new DataSourceClientBuilderException("name is needed!")
- if(typeId == null) throw new DataSourceClientBuilderException("typeId is needed!")
- if(currentPage == null) throw new DataSourceClientBuilderException("currentPage is needed!")
- if(pageSize == null) throw new DataSourceClientBuilderException("pageSize is needed!")
- if(user == null) throw new DataSourceClientBuilderException("user is needed!")
-
-
- val queryDataSourceEnvAction = new QueryDataSourceEnvAction
- queryDataSourceEnvAction.setParameter("name", name)
- queryDataSourceEnvAction.setParameter("typeId", typeId)
- queryDataSourceEnvAction.setParameter("currentPage", currentPage)
- queryDataSourceEnvAction.setParameter("pageSize", pageSize)
- queryDataSourceEnvAction.setUser(user)
-
- queryDataSourceEnvAction
- }
- }
-}
\ No newline at end of file
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceAction.scala
deleted file mode 100644
index a90db63..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceAction.scala
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * 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._
-import org.apache.linkis.datasource.client.exception.DataSourceClientBuilderException
-import org.apache.linkis.httpclient.dws.DWSHttpClient
-import org.apache.linkis.httpclient.request.PutAction
-
-import java.util
-import scala.collection.JavaConverters._
-
-class UpdateDataSourceAction extends PutAction with DataSourceAction{
- override def getRequestPayload: String = DWSHttpClient.jacksonJson.writeValueAsString(getRequestPayloads)
-
- private var user: String = _
- private var dataSourceId: String = _
-
- override def setUser(user: String): Unit = this.user = user
-
- override def getUser: String = this.user
-
- override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "info", dataSourceId, "json")
-}
-object UpdateDataSourceAction {
- def builder(): Builder = new Builder
-
- class Builder private[UpdateDataSourceAction]() {
- private var user: String = _
- private var dataSourceId: String = _
- private var payload: util.Map[String, Any] = new util.HashMap[String, Any]
-
- def setUser(user: String): Builder = {
- this.user = user
- this
- }
-
- def setDataSourceId(dataSourceId: String): Builder = {
- this.dataSourceId = dataSourceId
- this
- }
-
- def addRequestPayload(key: String, value: Any): Builder = {
- if (value != null) this.payload.put(key, value)
- this
- }
-
- def addRequestPayloads(map: util.Map[String, Any]): Builder = {
- this.synchronized(this.payload = map)
- this
- }
-
- def build(): UpdateDataSourceAction = {
- if (dataSourceId == null) throw new DataSourceClientBuilderException("dataSourceId is needed!")
- if(user == null) throw new DataSourceClientBuilderException("user is needed!")
-
- val action = new UpdateDataSourceAction()
- action.dataSourceId = dataSourceId
- action.user = user
-
- this.payload.asScala.foreach(k => {
- action.addRequestPayload(k._1, k._2)
- })
- action
- }
- }
-}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceParameterAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceParameterAction.scala
deleted file mode 100644
index e23cb4d..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceParameterAction.scala
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * 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._
-import org.apache.linkis.datasource.client.exception.DataSourceClientBuilderException
-import org.apache.linkis.httpclient.dws.DWSHttpClient
-import org.apache.linkis.httpclient.request.POSTAction
-import scala.collection.JavaConverters._
-import java.util
-
-class UpdateDataSourceParameterAction extends POSTAction with DataSourceAction {
- override def getRequestPayload: String = DWSHttpClient.jacksonJson.writeValueAsString(getRequestPayloads)
-
- private var user: String = _
- private var dataSourceId: String = _
-
- override def setUser(user: String): Unit = this.user = user
-
- override def getUser: String = this.user
-
- override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "parameter", dataSourceId, "json")
-}
-object UpdateDataSourceParameterAction {
- def builder(): Builder = new Builder
-
- class Builder private[UpdateDataSourceParameterAction]() {
- private var user: String = _
- private var dataSourceId: String = _
- private var payload: util.Map[String, Any] = new util.HashMap[String, Any]
-
- def setUser(user: String): Builder = {
- this.user = user
- this
- }
-
- def setDataSourceId(dataSourceId: String): Builder = {
- this.dataSourceId = dataSourceId
- this
- }
-
- def addRequestPayload(key: String, value: Any): Builder = {
- if (value != null) this.payload.put(key, value)
- this
- }
-
- def addRequestPayloads(map: util.Map[String, Any]): Builder = {
- this.synchronized(this.payload = map)
- this
- }
-
- def build(): UpdateDataSourceParameterAction = {
- if (dataSourceId == null) throw new DataSourceClientBuilderException("dataSourceId is needed!")
- if(user == null) throw new DataSourceClientBuilderException("user is needed!")
-
- val action = new UpdateDataSourceParameterAction()
- action.dataSourceId = dataSourceId
- action.user = user
- this.payload.asScala.foreach(k => {
- action.addRequestPayload(k._1, k._2)
- })
-
- action
- }
- }
-}
\ No newline at end of file
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/CreateDataSourceResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/CreateDataSourceResult.scala
deleted file mode 100644
index 2ea901c..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/CreateDataSourceResult.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.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/info/json")
-class CreateDataSourceResult extends DWSResult{
- @BeanProperty var insert_id: Long = _
-}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/DataSourceTestConnectResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/DataSourceTestConnectResult.scala
deleted file mode 100644
index e965a0e..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/DataSourceTestConnectResult.scala
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.datasource.client.config.DatasourceClientConfig._
-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/(\\S+)/(\\S+)/op/connect")
-class DataSourceTestConnectResult extends DWSResult{
- @BeanProperty var ok: Boolean = _
-}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/DeleteDataSourceResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/DeleteDataSourceResult.scala
deleted file mode 100644
index fadc593..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/DeleteDataSourceResult.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.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/info/(\\S+)")
-class DeleteDataSourceResult extends DWSResult{
- @BeanProperty var remove_id: Long = _
-}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/ExpireDataSourceResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/ExpireDataSourceResult.scala
deleted file mode 100644
index 1782036..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/ExpireDataSourceResult.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.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/info/(\\S+)/expire")
-class ExpireDataSourceResult extends DWSResult{
- @BeanProperty var expire_id: Long = _
-}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetAllDataSourceTypesResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetAllDataSourceTypesResult.scala
deleted file mode 100644
index ee1f339..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetAllDataSourceTypesResult.scala
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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 java.util
-
-import org.apache.linkis.datasourcemanager.common.domain.DataSourceType
-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/type/all")
-class GetAllDataSourceTypesResult extends DWSResult {
- @BeanProperty var type_list: java.util.List[java.util.Map[String, Any]] = _
-
- def getAllDataSourceType: util.List[DataSourceType] = {
- import scala.collection.JavaConverters._
-
- type_list.asScala.map(x => {
- val str = DWSHttpClient.jacksonJson.writeValueAsString(x)
- DWSHttpClient.jacksonJson.readValue(str, classOf[DataSourceType])
- }).asJava
- }
-}
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
deleted file mode 100644
index 5d708c4..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceIdResult.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.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/(\\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
deleted file mode 100644
index 0cd2ea2..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceNameResult.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.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/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-client/src/main/scala/org/apache/linkis/datasource/client/response/GetDataSourceVersionsResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetDataSourceVersionsResult.scala
deleted file mode 100644
index 81281b9..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetDataSourceVersionsResult.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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, DatasourceVersion}
-import org.apache.linkis.httpclient.dws.DWSHttpClient
-import org.apache.linkis.httpclient.dws.annotation.DWSHttpMessageResult
-import org.apache.linkis.httpclient.dws.response.DWSResult
-
-import java.util
-import scala.beans.BeanProperty
-
-@DWSHttpMessageResult("/api/rest_j/v\\d+/data-source-manager/(\\S+)/versions")
-class GetDataSourceVersionsResult extends DWSResult{
- @BeanProperty var versions: util.List[java.util.Map[String, Any]] = _
-
- def getDatasourceVersion: util.List[DatasourceVersion] = {
- import scala.collection.JavaConverters._
- versions.asScala.map(x => {
- val str = DWSHttpClient.jacksonJson.writeValueAsString(x)
- DWSHttpClient.jacksonJson.readValue(str, classOf[DatasourceVersion])
- }).asJava
- }
-}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoByDataSourceIdResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoByDataSourceIdResult.scala
deleted file mode 100644
index 6047c2a..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoByDataSourceIdResult.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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/info/(\\S+)")
-class GetInfoByDataSourceIdResult 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/main/scala/org/apache/linkis/datasource/client/response/GetKeyTypeDatasourceResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetKeyTypeDatasourceResult.scala
deleted file mode 100644
index 8f37cb5..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetKeyTypeDatasourceResult.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.{DataSourceParamKeyDefinition}
-import org.apache.linkis.httpclient.dws.DWSHttpClient
-import org.apache.linkis.httpclient.dws.annotation.DWSHttpMessageResult
-import org.apache.linkis.httpclient.dws.response.DWSResult
-
-import java.util
-import scala.beans.BeanProperty
-
-@DWSHttpMessageResult("/api/rest_j/v\\d+/data-source-manager/key_define/type/(\\S+)")
-class GetKeyTypeDatasourceResult extends DWSResult{
- @BeanProperty var key_define: util.List[java.util.Map[String, Any]] = _
-
- def getDataSourceParamKeyDefinitions: util.List[DataSourceParamKeyDefinition] = {
- import scala.collection.JavaConverters._
- key_define.asScala.map(x => {
- val str = DWSHttpClient.jacksonJson.writeValueAsString(x)
- DWSHttpClient.jacksonJson.readValue(str, classOf[DataSourceParamKeyDefinition])
- }).asJava
- }
-}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetColumnsResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetColumnsResult.scala
deleted file mode 100644
index fbee632..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetColumnsResult.scala
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.httpclient.dws.DWSHttpClient
-import org.apache.linkis.httpclient.dws.annotation.DWSHttpMessageResult
-import org.apache.linkis.httpclient.dws.response.DWSResult
-import org.apache.linkis.metadatamanager.common.domain.MetaColumnInfo
-
-import java.util
-import scala.beans.BeanProperty
-
-@DWSHttpMessageResult("/api/rest_j/v\\d+/metadatamanager/columns/(\\S+)/db/(\\S+)/table/(\\S+)")
-class MetadataGetColumnsResult extends DWSResult{
- @BeanProperty var columns: util.List[java.util.Map[String, Any]] = _
-
- def getAllColumns: util.List[MetaColumnInfo] = {
- import scala.collection.JavaConverters._
- columns.asScala.map(x => {
- val str = DWSHttpClient.jacksonJson.writeValueAsString(x)
- DWSHttpClient.jacksonJson.readValue(str, classOf[MetaColumnInfo])
- }).asJava
- }
-}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetDatabasesResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetDatabasesResult.scala
deleted file mode 100644
index 27fab04..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetDatabasesResult.scala
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.httpclient.dws.annotation.DWSHttpMessageResult
-import org.apache.linkis.httpclient.dws.response.DWSResult
-
-import java.util
-import scala.beans.BeanProperty
-
-@DWSHttpMessageResult("/api/rest_j/v\\d+/metadatamanager/dbs/(\\S+)")
-class MetadataGetDatabasesResult extends DWSResult{
- @BeanProperty var dbs: util.List[String] = _
-}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetPartitionsResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetPartitionsResult.scala
deleted file mode 100644
index 8b81049..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetPartitionsResult.scala
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.httpclient.dws.annotation.DWSHttpMessageResult
-import org.apache.linkis.httpclient.dws.response.DWSResult
-import org.apache.linkis.metadatamanager.common.domain.MetaPartitionInfo
-
-import scala.beans.BeanProperty
-
-@DWSHttpMessageResult("/api/rest_j/v\\d+/metadatamanager/partitions/(\\S+)/db/(\\S+)/table/(\\S+)")
-class MetadataGetPartitionsResult extends DWSResult{
- @BeanProperty var props: MetaPartitionInfo = _
-}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablePropsResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablePropsResult.scala
deleted file mode 100644
index 83b9505..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablePropsResult.scala
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.httpclient.dws.annotation.DWSHttpMessageResult
-import org.apache.linkis.httpclient.dws.response.DWSResult
-
-import java.util
-import scala.beans.BeanProperty
-
-@DWSHttpMessageResult("/api/rest_j/v\\d+/metadatamanager/props/(\\S+)/db/(\\S+)/table/(\\S+)")
-class MetadataGetTablePropsResult extends DWSResult{
- @BeanProperty var props: util.Map[String, String] = _
-}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablesResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablesResult.scala
deleted file mode 100644
index ca36f55..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablesResult.scala
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.httpclient.dws.annotation.DWSHttpMessageResult
-import org.apache.linkis.httpclient.dws.response.DWSResult
-
-import java.util
-import scala.beans.BeanProperty
-
-@DWSHttpMessageResult("/api/rest_j/v\\d+/metadatamanager/tables/(\\S+)/db/(\\S+)")
-class MetadataGetTablesResult extends DWSResult{
- @BeanProperty var tables: util.List[String] = _
-}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/PublishDataSourceVersionResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/PublishDataSourceVersionResult.scala
deleted file mode 100644
index 99db9ac..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/PublishDataSourceVersionResult.scala
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.httpclient.dws.annotation.DWSHttpMessageResult
-import org.apache.linkis.httpclient.dws.response.DWSResult
-
-@DWSHttpMessageResult("/api/rest_j/v\\d+/data-source-manager/publish/(\\S+)/(\\S+)")
-class PublishDataSourceVersionResult extends DWSResult{
-
-}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceEnvResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceEnvResult.scala
deleted file mode 100644
index e0eff52..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceEnvResult.scala
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.DataSourceEnv
-import org.apache.linkis.httpclient.dws.DWSHttpClient
-import org.apache.linkis.httpclient.dws.annotation.DWSHttpMessageResult
-import org.apache.linkis.httpclient.dws.response.DWSResult
-
-import java.util
-import scala.beans.BeanProperty
-
-@DWSHttpMessageResult("/api/rest_j/v\\d+/data-source-manager/env")
-class QueryDataSourceEnvResult extends DWSResult{
- @BeanProperty var query_list: java.util.List[java.util.Map[String, Any]] = _
-
- def getDataSourceEnv: util.List[DataSourceEnv] = {
- import scala.collection.JavaConverters._
-
- query_list.asScala.map(x => {
- val str = DWSHttpClient.jacksonJson.writeValueAsString(x)
- DWSHttpClient.jacksonJson.readValue(str, classOf[DataSourceEnv])
- }).asJava
- }
-}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceResult.scala
deleted file mode 100644
index eb1c613..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceResult.scala
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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 java.util
-import scala.beans.BeanProperty
-
-@DWSHttpMessageResult("/api/rest_j/v\\d+/data-source-manager/info")
-class QueryDataSourceResult extends DWSResult{
- @BeanProperty var query_list: util.List[java.util.Map[String, Any]] = _
- @BeanProperty var totalPage: Int = _
-
- def getAllDataSource: util.List[DataSource] = {
- import scala.collection.JavaConverters._
- query_list.asScala.map(x => {
- val str = DWSHttpClient.jacksonJson.writeValueAsString(x)
- DWSHttpClient.jacksonJson.readValue(str, classOf[DataSource])
- }).asJava
- }
-}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/UpdateDataSourceParameterResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/UpdateDataSourceParameterResult.scala
deleted file mode 100644
index dfdf25b..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/UpdateDataSourceParameterResult.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.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/parameter/(\\S+)/json")
-class UpdateDataSourceParameterResult extends DWSResult{
- @BeanProperty var version: Long = _
-}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/UpdateDataSourceResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/UpdateDataSourceResult.scala
deleted file mode 100644
index 667722b..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/UpdateDataSourceResult.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.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/info/(\\S+)/json")
-class UpdateDataSourceResult extends DWSResult{
- @BeanProperty var insert_id: Long = _
-}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/scala/org/apache/linkis/datasource/client/TestDataSourceClient.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/scala/org/apache/linkis/datasource/client/TestDataSourceClient.scala
deleted file mode 100644
index 574c42c..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/scala/org/apache/linkis/datasource/client/TestDataSourceClient.scala
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * 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
-
-import org.apache.linkis.datasource.client.impl.LinkisDataSourceRemoteClient
-import org.apache.linkis.datasource.client.request._
-import org.apache.linkis.httpclient.dws.authentication.StaticAuthenticationStrategy
-import org.apache.linkis.httpclient.dws.config.DWSClientConfigBuilder
-
-import java.util.concurrent.TimeUnit
-
-object TestDataSourceClient {
- def main(args: Array[String]): Unit = {
- val clientConfig = DWSClientConfigBuilder.newBuilder()
- .addServerUrl("http://127.0.0.1:9001")
- .connectionTimeout(30000)
- .discoveryEnabled(false)
- .discoveryFrequency(1, TimeUnit.MINUTES)
- .loadbalancerEnabled(true)
- .maxConnectionSize(5)
- .retryEnabled(false)
- .readTimeout(30000)
- .setAuthenticationStrategy(new StaticAuthenticationStrategy())
- .setAuthTokenKey("hadoop")
- .setAuthTokenValue("hadoop")
- .setDWSVersion("v1")
- .build()
-
- val dataSourceClient = new LinkisDataSourceRemoteClient(clientConfig)
-
- val getAllDataSourceTypesResult = dataSourceClient.getAllDataSourceTypes(GetAllDataSourceTypesAction.builder().setUser("hadoop").build()).getAllDataSourceType
-
- val queryDataSourceEnvResult = dataSourceClient.queryDataSourceEnv(
- QueryDataSourceEnvAction.builder()
- .setName("mysql")
- .setTypeId(2)
- .setCurrentPage(1)
- .setPageSize(1)
- .setUser("hadoop")
- .build()).getDataSourceEnv
-
- val getInfoByDataSourceIdResult = dataSourceClient.getInfoByDataSourceId(
- GetInfoByDataSourceIdAction.builder().setDataSourceId(1).setSystem("xx").setUser("hadoop").build()
- ).getDataSource
-
- val queryDataSourceResult = dataSourceClient.queryDataSource(QueryDataSourceAction.builder()
- .setSystem("")
- .setName("mysql")
- .setTypeId(1)
- .setIdentifies("")
- .setCurrentPage(1)
- .setPageSize(10)
- .setUser("hadoop")
- .build()
- ).getAllDataSource
-
- val getConnectParamsByDataSourceIdResult = dataSourceClient.getConnectParams(
- GetConnectParamsByDataSourceIdAction.builder().setDataSourceId(1).setSystem("xx").setUser("hadoop").build()
- )
-
-
- }
-}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/DsmConfiguration.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/DsmConfiguration.java
deleted file mode 100644
index 8c755c1..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/DsmConfiguration.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.datasourcemanager.common;
-
-import org.apache.linkis.common.conf.CommonVars;
-
-/** Configuration */
-public class DsmConfiguration {
-
- public static CommonVars<String> DSM_ADMIN_USER_LIST =
- CommonVars.apply("wds.linkis.server.dsm.admin.users", "");
-}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/scala/org/apache/linkis/metadatamanager/server/receiver/BaseMetaReceiver.scala b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/scala/org/apache/linkis/metadatamanager/server/receiver/BaseMetaReceiver.scala
deleted file mode 100644
index 47d779c..0000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/scala/org/apache/linkis/metadatamanager/server/receiver/BaseMetaReceiver.scala
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * 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.metadatamanager.server.receiver
-
-import org.apache.linkis.common.exception.WarnException
-import org.apache.linkis.common.utils.{Logging, Utils}
-import org.apache.linkis.metadatamanager.common.exception.MetaMethodInvokeException
-import org.apache.linkis.metadatamanager.common.protocol.{MetadataConnect, MetadataResponse}
-import org.apache.linkis.metadatamanager.server.service.MetadataAppService
-import org.apache.linkis.rpc.{Receiver, Sender}
-import org.apache.linkis.server.BDPJettyServerHelper
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Component
-
-import scala.concurrent.duration.Duration
-
-@Component
-class BaseMetaReceiver extends Receiver with Logging{
- @Autowired
- private var metadataAppService:MetadataAppService = _
-
-
- override def receive(message: Any, sender: Sender): Unit = ???
-
- override def receiveAndReply(message: Any, sender: Sender): Any = invoke(metadataAppService, message)
-
- override def receiveAndReply(message: Any, duration: Duration, sender: Sender): Any = invoke(metadataAppService, message)
-
-
- def invoke(service: MetadataAppService, message: Any): Any = Utils.tryCatch{
- val data = message match {
- case MetadataConnect(dataSourceType, operator, params, version) =>
- service.getConnection(dataSourceType, operator, params)
- // MetadataConnection is not scala class
- null
- case _ => new Object()
- }
- MetadataResponse(status = true, BDPJettyServerHelper.gson.toJson(data))
- }{
- case e: WarnException => val errorMsg = e.getMessage
- trace(s"Fail to invoke meta service: [$errorMsg]")
- MetadataResponse(status = false, errorMsg)
- case t: Exception =>
- t match {
- case exception: MetaMethodInvokeException =>
- MetadataResponse(status = false, exception.getCause.getMessage)
- case _ =>
- error(s"Fail to invoke meta service", t)
- MetadataResponse(status = false, t.getMessage)
- }
- }
-}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org