You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2022/08/19 06:20:29 UTC
[incubator-linkis] branch dev-1.3.0 updated: Scala code format alarm clear in linkis-bml-client (#2789)
This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.0 by this push:
new e0d204aec Scala code format alarm clear in linkis-bml-client (#2789)
e0d204aec is described below
commit e0d204aec5e3f0fe9bb7ce859ab1b42154d3f078
Author: ruY <43...@users.noreply.github.com>
AuthorDate: Fri Aug 19 14:20:24 2022 +0800
Scala code format alarm clear in linkis-bml-client (#2789)
* fix: scala syntax is popular in idea
* fix: mvn spotless:apply run
* fix:Support Chinese remark adjustment
* fix: Modify the allowable length of a single line to 200
---
.../linkis/bml/client/impl/HttpBmlClient.scala | 58 ++++++++++++----------
.../bml/common/POSTActionFailException.scala | 2 +-
.../org/apache/linkis/bml/http/HttpConf.scala | 10 ----
.../org/apache/linkis/bml/response/BmlResult.scala | 4 +-
scalastyle-config.xml | 4 +-
5 files changed, 36 insertions(+), 42 deletions(-)
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/client/impl/HttpBmlClient.scala b/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/client/impl/HttpBmlClient.scala
index 12f4c144f..f0451dec2 100644
--- a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/client/impl/HttpBmlClient.scala
+++ b/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/client/impl/HttpBmlClient.scala
@@ -123,21 +123,21 @@ class HttpBmlClient(
version: String
): BmlDownloadResponse = {
val bmlDownloadAction = BmlDownloadAction()
- import scala.collection.JavaConversions._
- bmlDownloadAction.getParameters += "resourceId" -> resourceId
+ import scala.collection.JavaConverters._
+ bmlDownloadAction.getParameters.asScala += "resourceId" -> resourceId
// TODO: 不能放非空的参数
- if (version != null) bmlDownloadAction.getParameters += "version" -> version
+ if (version != null) bmlDownloadAction.getParameters.asScala += "version" -> version
bmlDownloadAction.setUser(user)
val downloadResult = dwsClient.execute(bmlDownloadAction)
-// val retIs = new ByteArrayInputStream(IOUtils.toString(bmlDownloadAction.getInputStream).getBytes("UTF-8"))
-// if (downloadResult != null) {
-// bmlDownloadAction.getResponse match {
-// case r: CloseableHttpResponse =>
-// Utils.tryAndWarn(r.close())
-// case o: Any =>
-// info(s"Download response : ${o.getClass.getName} cannot close.")
-// }
-// }
+ // val retIs = new ByteArrayInputStream(IOUtils.toString(bmlDownloadAction.getInputStream).getBytes("UTF-8"))
+ // if (downloadResult != null) {
+ // bmlDownloadAction.getResponse match {
+ // case r: CloseableHttpResponse =>
+ // Utils.tryAndWarn(r.close())
+ // case o: Any =>
+ // info(s"Download response : ${o.getClass.getName} cannot close.")
+ // }
+ // }
BmlDownloadResponse(
isSuccess = true,
bmlDownloadAction.getInputStream,
@@ -174,9 +174,11 @@ class HttpBmlClient(
fileSystem.init(new util.HashMap[String, String]())
val fullFileName = path
val downloadAction = BmlDownloadAction()
- import scala.collection.JavaConversions._
- downloadAction.getParameters += "resourceId" -> resourceId
- if (StringUtils.isNotEmpty(version)) downloadAction.getParameters += "version" -> version
+ import scala.collection.JavaConverters._
+ downloadAction.getParameters.asScala += "resourceId" -> resourceId
+ if (StringUtils.isNotEmpty(version)) {
+ downloadAction.getParameters.asScala += "version" -> version
+ }
downloadAction.setUser(user)
var inputStream: InputStream = null
var outputStream: OutputStream = null
@@ -226,9 +228,11 @@ class HttpBmlClient(
fileSystem.init(new util.HashMap[String, String]())
val fullFileName = path
val downloadAction = BmlDownloadShareAction()
- import scala.collection.JavaConversions._
- downloadAction.getParameters += "resourceId" -> resourceId
- if (StringUtils.isNotEmpty(version)) downloadAction.getParameters += "version" -> version
+ import scala.collection.JavaConverters._
+ downloadAction.getParameters.asScala += "resourceId" -> resourceId
+ if (StringUtils.isNotEmpty(version)) {
+ downloadAction.getParameters.asScala += "version" -> version
+ }
downloadAction.setUser(user)
var inputStream: InputStream = null
var outputStream: OutputStream = null
@@ -521,7 +525,7 @@ class HttpBmlClient(
user: String,
projectName: String,
filePath: String
- ): BmlUploadResponse = ???
+ ): BmlUploadResponse = null
override def downloadShareResource(
user: String,
@@ -529,10 +533,10 @@ class HttpBmlClient(
version: String
): BmlDownloadResponse = {
val bmlDownloadShareAction = BmlDownloadShareAction()
- import scala.collection.JavaConversions._
- bmlDownloadShareAction.getParameters += "resourceId" -> resourceId
+ import scala.collection.JavaConverters._
+ bmlDownloadShareAction.getParameters.asScala += "resourceId" -> resourceId
// TODO: 不能放非空的参数
- if (version != null) bmlDownloadShareAction.getParameters += "version" -> version
+ if (version != null) bmlDownloadShareAction.getParameters.asScala += "version" -> version
bmlDownloadShareAction.setUser(user)
val result = dwsClient.execute(bmlDownloadShareAction)
BmlDownloadResponse(
@@ -544,7 +548,7 @@ class HttpBmlClient(
)
}
- override def downloadShareResource(user: String, resourceId: String): BmlDownloadResponse = ???
+ override def downloadShareResource(user: String, resourceId: String): BmlDownloadResponse = null
override def updateShareResource(
user: String,
@@ -583,13 +587,13 @@ class HttpBmlClient(
user: String,
resourceId: String,
filePath: String
- ): BmlUpdateResponse = ???
+ ): BmlUpdateResponse = null
- override def getProjectInfoByName(projectName: String): BmlProjectInfoResponse = ???
+ override def getProjectInfoByName(projectName: String): BmlProjectInfoResponse = null
- override def getResourceInfo(resourceId: String): BmlResourceInfoResponse = ???
+ override def getResourceInfo(resourceId: String): BmlResourceInfoResponse = null
- override def getProjectPriv(projectName: String): BmlProjectPrivResponse = ???
+ override def getProjectPriv(projectName: String): BmlProjectPrivResponse = null
override def attachResourceAndProject(
projectName: String,
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/common/POSTActionFailException.scala b/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/common/POSTActionFailException.scala
index 12b296b21..874fe9f19 100644
--- a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/common/POSTActionFailException.scala
+++ b/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/common/POSTActionFailException.scala
@@ -20,7 +20,7 @@ package org.apache.linkis.bml.common
import org.apache.linkis.common.exception.ErrorException
case class POSTActionFailException()
- extends ErrorException(70025, "material house client request failed (物料库客户端请求失败)") {}
+ extends ErrorException(70025, "material house client request failed(物料库客户端请求失败)") {}
case class POSTResultNotMatchException()
extends ErrorException(
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/http/HttpConf.scala b/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/http/HttpConf.scala
index 09f394e3b..8982812d9 100644
--- a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/http/HttpConf.scala
+++ b/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/http/HttpConf.scala
@@ -50,14 +50,4 @@ object HttpConf {
val rollbackVersionUrl: String = urlPrefix + "/" + "rollbackVersion"
val copyResourceUrl: String = urlPrefix + "/" + "copyResourceToAnotherUser"
- def main(args: Array[String]): Unit = {
- println(uploadURL)
- println(downloadURL)
- println(updateVersionURL)
- println(relateHdfsURL)
- println(relateStorageURL)
- println(getResourcesUrl)
- println(updateBasicUrl)
- }
-
}
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/response/BmlResult.scala b/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/response/BmlResult.scala
index 6ec82ac4a..52a231499 100644
--- a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/response/BmlResult.scala
+++ b/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/response/BmlResult.scala
@@ -60,9 +60,9 @@ class BmlRelateStorageResult extends BmlRelateResult {}
@DWSHttpMessageResult("/api/rest_j/v\\d+/bml/relateHdfs")
class BmlRelateHdfsResult extends BmlRelateResult {}
-//case class Version(version:String,
+// case class Version(version:String,
// resource:String)
-//case class ResourceVersions(resourceId:String,
+// case class ResourceVersions(resourceId:String,
// user:String,
// system:String,
// versions:java.util.List[Version])
diff --git a/scalastyle-config.xml b/scalastyle-config.xml
index 964f3eb71..3d2bf1cb8 100644
--- a/scalastyle-config.xml
+++ b/scalastyle-config.xml
@@ -75,7 +75,7 @@ This file is divided into 3 sections:
<check level="error" class="org.scalastyle.file.FileLineLengthChecker" enabled="true">
<parameters>
- <parameter name="maxLineLength"><![CDATA[100]]></parameter>
+ <parameter name="maxLineLength"><![CDATA[200]]></parameter>
<parameter name="tabSize"><![CDATA[2]]></parameter>
<parameter name="ignoreImports">true</parameter>
</parameters>
@@ -116,7 +116,7 @@ This file is divided into 3 sections:
<check level="error" class="org.scalastyle.file.NewLineAtEofChecker" enabled="true"></check>
- <check customId="nonascii" level="error" class="org.scalastyle.scalariform.NonASCIICharacterChecker" enabled="true"></check>
+ <check customId="nonascii" level="warning" class="org.scalastyle.scalariform.NonASCIICharacterChecker" enabled="true"></check>
<check level="error" class="org.scalastyle.scalariform.SpaceAfterCommentStartChecker" enabled="true"></check>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org