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

[incubator-linkis] 10/10: datasource:adjust dataSourceId parameter is unified as long type

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

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

commit f999701692d0456b13734d498f336f9660026ed0
Author: casionone <ca...@gmail.com>
AuthorDate: Mon Mar 7 12:28:49 2022 +0800

    datasource:adjust dataSourceId parameter is unified as long type
---
 .../datasource/client/request/DataSourceTestConnectAction.scala   | 8 ++++----
 .../linkis/datasource/client/request/ExpireDataSourceAction.scala | 8 ++++----
 .../datasource/client/request/MetadataGetPartitionsAction.scala   | 8 ++++----
 .../client/request/PublishDataSourceVersionAction.scala           | 8 ++++----
 .../linkis/datasource/client/request/UpdateDataSourceAction.scala | 8 ++++----
 .../client/request/UpdateDataSourceParameterAction.scala          | 8 ++++----
 6 files changed, 24 insertions(+), 24 deletions(-)

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
index 49d45cf..3704db2 100644
--- 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
@@ -26,7 +26,7 @@ import org.apache.linkis.httpclient.request.PutAction
 class DataSourceTestConnectAction private() extends PutAction with DataSourceAction {
   private var user: String = _
 
-  private var dataSourceId: String = _
+  private var dataSourceId: Long = _
 
   private var version: String = _
 
@@ -34,7 +34,7 @@ class DataSourceTestConnectAction private() extends PutAction with DataSourceAct
 
   override def getUser: String = this.user
 
-  override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, dataSourceId, version, "op", "connect")
+  override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, dataSourceId.toString, version, "op", "connect")
 
   override def getRequestPayload: String = DWSHttpClient.jacksonJson.writeValueAsString(getRequestPayloads)
 }
@@ -43,7 +43,7 @@ object DataSourceTestConnectAction {
 
   class Builder private[DataSourceTestConnectAction]() {
     private var user: String = _
-    private var dataSourceId: String = _
+    private var dataSourceId: Long = _
     private var version: String = _
 
     def setUser(user: String): Builder = {
@@ -51,7 +51,7 @@ object DataSourceTestConnectAction {
       this
     }
 
-    def setDataSourceId(dataSourceId: String): Builder = {
+    def setDataSourceId(dataSourceId: Long): Builder = {
       this.dataSourceId = dataSourceId
       this
     }
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
index ef20f16..0200b7d 100644
--- 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
@@ -27,26 +27,26 @@ class ExpireDataSourceAction extends PutAction with DataSourceAction {
 
   private var user: String = _
 
-  private var dataSourceId: String = _
+  private var dataSourceId: Long = _
 
   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")
+  override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "info", dataSourceId.toString, "expire")
 }
 object ExpireDataSourceAction{
   def builder(): Builder = new Builder
   class Builder private[ExpireDataSourceAction]() {
     private var user: String = _
-    private var dataSourceId: String = _
+    private var dataSourceId: Long = _
 
     def setUser(user: String): Builder = {
       this.user = user
       this
     }
 
-    def setDataSourceId(dataSourceId: String): Builder = {
+    def setDataSourceId(dataSourceId: Long): Builder = {
       this.dataSourceId = dataSourceId
       this
     }
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
index 9bbde2e..def90b3 100644
--- 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
@@ -23,11 +23,11 @@ import org.apache.linkis.httpclient.request.GetAction
 
 
 class MetadataGetPartitionsAction extends GetAction with DataSourceAction {
-  private var dataSourceId: String = _
+  private var dataSourceId: Long = _
   private var database: String = _
   private var table: String = _
 
-  override def suffixURLs: Array[String] = Array(METADATA_SERVICE_MODULE.getValue, "partitions", dataSourceId, "db", database, "table", table)
+  override def suffixURLs: Array[String] = Array(METADATA_SERVICE_MODULE.getValue, "partitions", dataSourceId.toString, "db", database, "table", table)
 
   private var user: String = _
 
@@ -41,7 +41,7 @@ object MetadataGetPartitionsAction {
   def builder(): Builder = new Builder
 
   class Builder private[MetadataGetPartitionsAction]() {
-    private var dataSourceId: String = _
+    private var dataSourceId: Long = _
     private var database: String = _
     private var table: String = _
     private var system: String = _
@@ -52,7 +52,7 @@ object MetadataGetPartitionsAction {
       this
     }
 
-    def setDataSourceId(dataSourceId: String): Builder = {
+    def setDataSourceId(dataSourceId: Long): Builder = {
       this.dataSourceId = dataSourceId
       this
     }
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
index e6a7b8e..404abd5 100644
--- 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
@@ -26,21 +26,21 @@ 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 dataSourceId: Long = _
   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)
+  override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "publish", dataSourceId.toString, versionId)
 }
 object PublishDataSourceVersionAction {
   def builder(): Builder = new Builder
 
   class Builder private[PublishDataSourceVersionAction]() {
     private var user: String = _
-    private var dataSourceId: String = _
+    private var dataSourceId: Long = _
     private var versionId: String = _
 
     def setUser(user: String): Builder = {
@@ -48,7 +48,7 @@ object PublishDataSourceVersionAction {
       this
     }
 
-    def setDataSourceId(dataSourceId: String): Builder = {
+    def setDataSourceId(dataSourceId: Long): Builder = {
       this.dataSourceId = dataSourceId
       this
     }
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
index 051d80f..9ef5cd0 100644
--- 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
@@ -30,20 +30,20 @@ class UpdateDataSourceAction extends PutAction with DataSourceAction{
   override def getRequestPayload: String = DWSHttpClient.jacksonJson.writeValueAsString(getRequestPayloads)
 
   private var user: String = _
-  private var dataSourceId: String = _
+  private var dataSourceId: Long = _
 
   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")
+  override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "info", dataSourceId.toString, "json")
 }
 object UpdateDataSourceAction {
   def builder(): Builder = new Builder
 
   class Builder private[UpdateDataSourceAction]() {
     private var user: String = _
-    private var dataSourceId: String = _
+    private var dataSourceId: Long = _
     private var payload: util.Map[String, Any] = new util.HashMap[String, Any]
 
     def setUser(user: String): Builder = {
@@ -51,7 +51,7 @@ object UpdateDataSourceAction {
       this
     }
 
-    def setDataSourceId(dataSourceId: String): Builder = {
+    def setDataSourceId(dataSourceId: Long): Builder = {
       this.dataSourceId = dataSourceId
       this
     }
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
index ee38dea..8392262 100644
--- 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
@@ -29,20 +29,20 @@ class UpdateDataSourceParameterAction extends POSTAction with DataSourceAction {
   override def getRequestPayload: String = DWSHttpClient.jacksonJson.writeValueAsString(getRequestPayloads)
 
   private var user: String = _
-  private var dataSourceId: String = _
+  private var dataSourceId: Long = _
 
   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")
+  override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "parameter", dataSourceId.toString, "json")
 }
 object UpdateDataSourceParameterAction {
   def builder(): Builder = new Builder
 
   class Builder private[UpdateDataSourceParameterAction]() {
     private var user: String = _
-    private var dataSourceId: String = _
+    private var dataSourceId: Long = _
     private var payload: util.Map[String, Any] = new util.HashMap[String, Any]
 
     def setUser(user: String): Builder = {
@@ -50,7 +50,7 @@ object UpdateDataSourceParameterAction {
       this
     }
 
-    def setDataSourceId(dataSourceId: String): Builder = {
+    def setDataSourceId(dataSourceId: Long): Builder = {
       this.dataSourceId = dataSourceId
       this
     }

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