This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.3.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.1 by this push:
new 7fd206e2d feat: scala code format alarm clear in
linkis-computation-client (#3203)
7fd206e2d is described below
commit 7fd206e2db0b2c6a37cc71c95f7a2195da5343fd
Author: ruY <[email protected]>
AuthorDate: Sat Sep 3 14:00:00 2022 +0800
feat: scala code format alarm clear in linkis-computation-client (#3203)
---
.../apache/linkis/computation/client/LinkisJobBuilder.scala | 3 ++-
.../linkis/computation/client/job/AbstractLinkisJob.scala | 3 ++-
.../computation/client/once/simple/SimpleOnceJob.scala | 6 ++++--
.../client/request/GetPartitionStatisticInfoAction.scala | 6 ++++--
.../ujes/client/request/GetTableStatisticInfoAction.scala | 3 ++-
.../apache/linkis/ujes/client/request/JobExecIdAction.scala | 3 ++-
.../linkis/ujes/client/request/JobExecuteAction.scala | 6 ++++--
.../apache/linkis/ujes/client/request/JobListAction.scala | 3 ++-
.../apache/linkis/ujes/client/request/JobSubmitAction.scala | 3 ++-
.../apache/linkis/ujes/client/response/GetDBSResult.scala | 4 ++--
.../apache/linkis/ujes/client/response/JobInfoResult.scala | 7 ++++---
.../linkis/ujes/client/response/JobProgressResult.scala | 8 ++++----
.../linkis/ujes/client/response/ResultSetListResult.scala | 13 +++++++------
.../linkis/ujes/client/response/ResultSetResult.scala | 4 ++--
14 files changed, 43 insertions(+), 29 deletions(-)
diff --git
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/LinkisJobBuilder.scala
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/LinkisJobBuilder.scala
index 2791f866f..25c10ff6f 100644
---
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/LinkisJobBuilder.scala
+++
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/LinkisJobBuilder.scala
@@ -189,8 +189,9 @@ object LinkisJobBuilder {
def getDefaultServerUrl: String = {
if (StringUtils.isEmpty(serverUrl)) {
serverUrl = Configuration.getGateWayURL()
- if (StringUtils.isEmpty(serverUrl))
+ if (StringUtils.isEmpty(serverUrl)) {
throw new UJESClientBuilderException("serverUrl must be set!")
+ }
}
serverUrl
}
diff --git
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/job/AbstractLinkisJob.scala
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/job/AbstractLinkisJob.scala
index b9b4318fc..0dd9b3d15 100644
---
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/job/AbstractLinkisJob.scala
+++
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/job/AbstractLinkisJob.scala
@@ -53,7 +53,7 @@ trait AbstractLinkisJob extends LinkisJob with Logging {
}
protected def initJobDaemon(): Unit = if (future == null) jobListeners
synchronized {
- if (future == null)
+ if (future == null) {
future = LinkisJobBuilder.getThreadPoolExecutor.scheduleAtFixedRate(
new Runnable {
private var failedNum = 0
@@ -84,6 +84,7 @@ trait AbstractLinkisJob extends LinkisJob with Logging {
getPeriod,
TimeUnit.MILLISECONDS
)
+ }
}
override final def getOperator(operatorName: String): Operator[_] = {
diff --git
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/once/simple/SimpleOnceJob.scala
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/once/simple/SimpleOnceJob.scala
index 7fbe732a4..dbc1dabab 100644
---
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/once/simple/SimpleOnceJob.scala
+++
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/once/simple/SimpleOnceJob.scala
@@ -25,6 +25,8 @@ import
org.apache.linkis.computation.client.once.{LinkisManagerClient, OnceJob,
import org.apache.linkis.computation.client.once.action.CreateEngineConnAction
import org.apache.linkis.computation.client.operator.OnceJobOperator
+import java.util.Locale
+
import scala.concurrent.duration.Duration
trait SimpleOnceJob extends OnceJob {
@@ -43,7 +45,7 @@ trait SimpleOnceJob extends OnceJob {
isCompleted(lastEngineConnState)
}
- protected def isCompleted(status: String): Boolean = status.toLowerCase
match {
+ protected def isCompleted(status: String): Boolean =
status.toLowerCase(Locale.getDefault) match {
case "success" | "failed" =>
finalEngineConnState = status
getJobListeners.foreach(_.onJobFinished(this))
@@ -60,7 +62,7 @@ trait SimpleOnceJob extends OnceJob {
def getStatus: String = lastEngineConnState
override def isSucceed: Boolean = wrapperEC {
- finalEngineConnState.toLowerCase match {
+ finalEngineConnState.toLowerCase(Locale.getDefault) match {
case "success" => true
case _ => false
}
diff --git
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/GetPartitionStatisticInfoAction.scala
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/GetPartitionStatisticInfoAction.scala
index bb05d434d..b3a237fd1 100644
---
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/GetPartitionStatisticInfoAction.scala
+++
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/GetPartitionStatisticInfoAction.scala
@@ -59,11 +59,13 @@ object GetPartitionStatisticInfoAction {
def builder(): GetPartitionStatisticInfoAction = {
if (StringUtils.isBlank(user)) throw new
UJESClientBuilderException("user is needed!")
- if (StringUtils.isBlank(database))
+ if (StringUtils.isBlank(database)) {
throw new UJESClientBuilderException("database is needed!")
+ }
if (StringUtils.isBlank(tableName)) throw new
UJESClientBuilderException("table is needed!")
- if (StringUtils.isBlank(partitionPath))
+ if (StringUtils.isBlank(partitionPath)) {
throw new UJESClientBuilderException("partitionPath is needed!")
+ }
val getPartitionStatisticInfoAction = new GetPartitionStatisticInfoAction
getPartitionStatisticInfoAction.setUser(user)
getPartitionStatisticInfoAction.setParameter("database", database)
diff --git
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/GetTableStatisticInfoAction.scala
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/GetTableStatisticInfoAction.scala
index 6d9c62580..2268122a1 100644
---
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/GetTableStatisticInfoAction.scala
+++
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/GetTableStatisticInfoAction.scala
@@ -71,8 +71,9 @@ object GetTableStatisticInfoAction {
def builder(): GetTableStatisticInfoAction = {
if (StringUtils.isBlank(user)) throw new
UJESClientBuilderException("user is needed!")
- if (StringUtils.isBlank(database))
+ if (StringUtils.isBlank(database)) {
throw new UJESClientBuilderException("database is needed!")
+ }
if (StringUtils.isBlank(tableName)) throw new
UJESClientBuilderException("table is needed!")
val getTableStatisticInfoAction = new GetTableStatisticInfoAction
getTableStatisticInfoAction.setUser(user)
diff --git
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobExecIdAction.scala
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobExecIdAction.scala
index c9ba55d23..61cdc2721 100644
---
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobExecIdAction.scala
+++
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobExecIdAction.scala
@@ -55,8 +55,9 @@ object JobExecIdAction {
val jobStatusAction = new JobExecIdAction
if (execId == null) throw new UJESClientBuilderException("execId is
needed!")
if (user == null) throw new UJESClientBuilderException("user is needed!")
- if (jobServiceType == null)
+ if (jobServiceType == null) {
throw new UJESClientBuilderException("jobServiceType is needed!")
+ }
jobStatusAction.execId = execId
jobStatusAction.setUser(user)
jobStatusAction.jobServiceType = jobServiceType
diff --git
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobExecuteAction.scala
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobExecuteAction.scala
index 7f9223a09..16acb5d92 100644
---
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobExecuteAction.scala
+++
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobExecuteAction.scala
@@ -143,8 +143,9 @@ object JobExecuteAction {
}
private def getEngineType: String = {
- if (engineType == null && engineTypeStr == null)
+ if (engineType == null && engineTypeStr == null) {
throw new UJESClientBuilderException("engineType is needed!")
+ }
if (engineType != null) return engineType.toString
engineTypeStr
}
@@ -164,8 +165,9 @@ object JobExecuteAction {
if (formatCode) executeAction.addRequestPayload(TaskConstant.FORMATCODE,
true)
if (StringUtils.isBlank(creator)) throw new
UJESClientBuilderException("creator is needed!")
executeAction.addRequestPayload(TaskConstant.REQUESTAPPLICATIONNAME,
creator)
- if (StringUtils.isEmpty(scriptPath) && StringUtils.isEmpty(executeCode)
&& params == null)
+ if (StringUtils.isEmpty(scriptPath) && StringUtils.isEmpty(executeCode)
&& params == null) {
throw new UJESClientBuilderException("scriptPath or executeCode is
needed!")
+ }
if (StringUtils.isEmpty(scriptPath) && StringUtils.isEmpty(executeCode))
{
addExecuteCode(params.toString)
}
diff --git
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobListAction.scala
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobListAction.scala
index 71df2b67e..9561644d7 100644
---
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobListAction.scala
+++
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobListAction.scala
@@ -97,8 +97,9 @@ object JobListAction {
if (pageNow > 0) jobListAction.setParameter("pageNow", pageNow)
if (pageSize > 0) jobListAction.setParameter("pageSize", pageSize)
if (taskID > 0) jobListAction.setParameter("taskID", taskID)
- if (StringUtils.isNotBlank(executeApplicationName))
+ if (StringUtils.isNotBlank(executeApplicationName)) {
jobListAction.setParameter("executeApplicationName",
executeApplicationName)
+ }
jobListAction
}
diff --git
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobSubmitAction.scala
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobSubmitAction.scala
index a51a926be..a42273f8c 100644
---
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobSubmitAction.scala
+++
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobSubmitAction.scala
@@ -136,8 +136,9 @@ object JobSubmitAction {
submitAction.setUser(user)
submitAction.addRequestPayload(TaskConstant.EXECUTE_USER, executeUser)
if (formatCode) submitAction.addRequestPayload(TaskConstant.FORMATCODE,
true)
- if (executionContent == null && params == null)
+ if (executionContent == null && params == null) {
throw new UJESClientBuilderException("executionContent is needed!")
+ }
submitAction.addRequestPayload(TaskConstant.EXECUTION_CONTENT,
executionContent)
if (params == null) params = new util.HashMap[String, Any]()
submitAction.addRequestPayload(TaskConstant.PARAMS, params)
diff --git
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/GetDBSResult.scala
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/GetDBSResult.scala
index 65858eb31..acaac4b1d 100644
---
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/GetDBSResult.scala
+++
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/GetDBSResult.scala
@@ -26,7 +26,7 @@ import org.apache.commons.collections.CollectionUtils
import java.util
import scala.beans.BeanProperty
-import scala.collection.JavaConversions._
+import scala.collection.JavaConverters._
@DWSHttpMessageResult("/api/rest_j/v\\d+/datasource/dbs")
class GetDBSResult extends DWSResult with UserAction {
@@ -35,7 +35,7 @@ class GetDBSResult extends DWSResult with UserAction {
def getDBSName(): util.List[String] = {
val dbsList = new util.ArrayList[String]()
if (CollectionUtils.isNotEmpty(dbs)) {
- dbs.foreach { db =>
+ dbs.asScala.foreach { db =>
dbsList.add(db.get("dbName"))
}
}
diff --git
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/JobInfoResult.scala
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/JobInfoResult.scala
index 9d72ba61e..f8e6456da 100644
---
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/JobInfoResult.scala
+++
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/JobInfoResult.scala
@@ -63,7 +63,7 @@ class JobInfoResult extends DWSResult with UserAction with
Status {
}
- def getTask = task
+ def getTask: java.util.Map[_, _] = task
def getRequestPersistTask: RequestPersistTask = requestPersistTask
@@ -81,12 +81,13 @@ class JobInfoResult extends DWSResult with UserAction with
Status {
resultSetList
}
else if (resultSetList != null) resultSetList
- else if (isFailed)
+ else if (isFailed) {
throw new UJESJobException(requestPersistTask.getErrCode,
requestPersistTask.getErrDesc)
- else
+ } else {
throw new UJESJobException(
s"job ${requestPersistTask.getTaskID} is still executing with state
${requestPersistTask.getStatus}."
)
+ }
}
override def getJobStatus: String = requestPersistTask.getStatus
diff --git
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/JobProgressResult.scala
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/JobProgressResult.scala
index 37eea4fd0..c9a5819bf 100644
---
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/JobProgressResult.scala
+++
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/JobProgressResult.scala
@@ -36,14 +36,14 @@ class JobProgressResult extends UJESJobResult {
private implicit val formats = DefaultFormats
- def setProgress(progress: Float) = this.progress = progress
- def getProgress = progress
+ def setProgress(progress: Float): Unit = this.progress = progress
+ def getProgress: Float = progress
- def setProgressInfo(progressInfo: List[Map[String, AnyRef]]) = {
+ def setProgressInfo(progressInfo: List[Map[String, AnyRef]]): Unit = {
this.progressInfo = progressInfo
progressInfos = progressInfo.map(map =>
read[JobProgressInfo](write(map.toMap))).toArray
}
- def getProgressInfo = progressInfos
+ def getProgressInfo: Array[JobProgressInfo] = progressInfos
}
diff --git
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/ResultSetListResult.scala
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/ResultSetListResult.scala
index 7a340b37a..f6fc94456 100644
---
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/ResultSetListResult.scala
+++
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/ResultSetListResult.scala
@@ -24,18 +24,19 @@ import org.apache.linkis.ujes.client.request.UserAction
import java.util
import scala.beans.BeanProperty
-import scala.collection.JavaConversions._
+import scala.collection.JavaConverters._
@DWSHttpMessageResult("/api/rest_j/v\\d+/filesystem/getDirFileTrees")
class ResultSetListResult extends DWSResult with UserAction {
@BeanProperty var dirFileTrees: util.Map[String, Object] = _
- def getResultSetList = if (dirFileTrees != null)
dirFileTrees.get("children") match {
- case list: util.List[util.Map[String, Object]] =>
- list.map(_.get("path").asInstanceOf[String]).toArray
- case _ => Array.empty[String]
- }
+ def getResultSetList: Array[String] = if (dirFileTrees != null)
+ dirFileTrees.get("children") match {
+ case list: util.List[util.Map[String, Object]] =>
+ list.asScala.map(_.get("path").asInstanceOf[String]).toArray
+ case _ => Array.empty[String]
+ }
else Array.empty[String]
}
diff --git
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/ResultSetResult.scala
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/ResultSetResult.scala
index 4e15c0c4a..973573f49 100644
---
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/ResultSetResult.scala
+++
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/ResultSetResult.scala
@@ -28,8 +28,8 @@ class ResultSetResult extends DWSResult with UserAction {
private var `type`: String = _
- def setType(`type`: String) = this.`type` = `type`
- def getType = `type`
+ def setType(`type`: String): Unit = this.`type` = `type`
+ def getType: String = `type`
@BeanProperty
var metadata: Object = _
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
