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 06c660a2c fix: scala error alarm update (#3714)
06c660a2c is described below
commit 06c660a2c30b1643a6ac367b70cf814888e803cc
Author: ruY <[email protected]>
AuthorDate: Tue Oct 25 14:13:59 2022 +0800
fix: scala error alarm update (#3714)
---
.../sender/eureka/EurekaClientRefreshUtils.scala | 3 +-
.../manager/common/utils/ResourceUtils.scala | 93 ++++++++++++++--------
.../hive/executor/HiveEngineConnExecutor.scala | 7 +-
.../engineplugin/io/service/FsProxyService.scala | 11 +--
.../manager/engineplugin/io/utils/IOHelp.scala | 20 +++--
.../engineplugin/jdbc/JDBCEngineConnPlugin.scala | 4 +-
.../linkis/engineplugin/spark/common/Kind.scala | 6 +-
.../spark/common/LineBufferedStream.scala | 6 +-
.../orchestrator/execution/ExecTaskRunner.scala | 8 +-
.../orchestrator/listener/task/TaskInfoEvent.scala | 2 +-
.../linkis/orchestrator/utils/TreeOperator.scala | 4 +-
.../apache/linkis/bml/protocol/BmlProtocol.scala | 6 +-
.../service/rpc/DefaultInsLabelRpcService.scala | 6 +-
.../impl/JobHistoryDetailQueryServiceImpl.scala | 4 +-
.../linkis/gateway/route/GatewayRouter.scala | 12 +--
.../linkis/gateway/security/UserRestful.scala | 7 +-
.../TokenAuthenticationStrategy.scala | 7 +-
.../ujes/route/label/RouteLabelParser.scala | 7 +-
.../websocket/WebsocketGatewaySession.scala | 2 +-
19 files changed, 133 insertions(+), 82 deletions(-)
diff --git
a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/eureka/EurekaClientRefreshUtils.scala
b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/eureka/EurekaClientRefreshUtils.scala
index 7c535e96e..1869778f4 100644
---
a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/eureka/EurekaClientRefreshUtils.scala
+++
b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/eureka/EurekaClientRefreshUtils.scala
@@ -41,8 +41,9 @@ class EurekaClientRefreshUtils {
private[eureka] def refreshEurekaClient(): Unit =
if (System.currentTimeMillis - eurekaClientLastRefreshTime >
serviceRefreshInterval) {
synchronized {
- if (System.currentTimeMillis - eurekaClientLastRefreshTime <
serviceRefreshInterval)
+ if (System.currentTimeMillis - eurekaClientLastRefreshTime <
serviceRefreshInterval) {
return
+ }
eurekaClientLastRefreshTime = System.currentTimeMillis
eurekaClient match {
case disClient: NetflixDiscoveryClient =>
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/utils/ResourceUtils.scala
b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/utils/ResourceUtils.scala
index dd09ec8cd..2279e50fd 100644
---
a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/utils/ResourceUtils.scala
+++
b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/utils/ResourceUtils.scala
@@ -37,18 +37,24 @@ object ResourceUtils {
def toPersistenceResource(nodeResource: NodeResource): PersistenceResource =
{
val persistenceResource = new PersistenceResource
- if (nodeResource.getMaxResource != null)
+ if (nodeResource.getMaxResource != null) {
persistenceResource.setMaxResource(serializeResource(nodeResource.getMaxResource))
- if (nodeResource.getMinResource != null)
+ }
+ if (nodeResource.getMinResource != null) {
persistenceResource.setMinResource(serializeResource(nodeResource.getMinResource))
- if (nodeResource.getLockedResource != null)
+ }
+ if (nodeResource.getLockedResource != null) {
persistenceResource.setLockedResource(serializeResource(nodeResource.getLockedResource))
- if (nodeResource.getExpectedResource != null)
+ }
+ if (nodeResource.getExpectedResource != null) {
persistenceResource.setExpectedResource(serializeResource(nodeResource.getExpectedResource))
- if (nodeResource.getLeftResource != null)
+ }
+ if (nodeResource.getLeftResource != null) {
persistenceResource.setLeftResource(serializeResource(nodeResource.getLeftResource))
- if (nodeResource.getUsedResource != null)
+ }
+ if (nodeResource.getUsedResource != null) {
persistenceResource.setUsedResource(serializeResource(nodeResource.getUsedResource))
+ }
persistenceResource.setResourceType(nodeResource.getResourceType.toString())
persistenceResource
}
@@ -57,22 +63,30 @@ object ResourceUtils {
if (persistenceResource == null) return null
val nodeResource = new CommonNodeResource
if (persistenceResource.getId != null)
nodeResource.setId(persistenceResource.getId)
- if (persistenceResource.getMaxResource != null)
+ if (persistenceResource.getMaxResource != null) {
nodeResource.setMaxResource(deserializeResource(persistenceResource.getMaxResource))
- if (persistenceResource.getMinResource != null)
+ }
+ if (persistenceResource.getMinResource != null) {
nodeResource.setMinResource(deserializeResource(persistenceResource.getMinResource))
- if (persistenceResource.getLockedResource != null)
+ }
+ if (persistenceResource.getLockedResource != null) {
nodeResource.setLockedResource(deserializeResource(persistenceResource.getLockedResource))
- if (persistenceResource.getExpectedResource != null)
+ }
+ if (persistenceResource.getExpectedResource != null) {
nodeResource.setExpectedResource(deserializeResource(persistenceResource.getExpectedResource))
- if (persistenceResource.getLeftResource != null)
+ }
+ if (persistenceResource.getLeftResource != null) {
nodeResource.setLeftResource(deserializeResource(persistenceResource.getLeftResource))
- if (persistenceResource.getUsedResource != null)
+ }
+ if (persistenceResource.getUsedResource != null) {
nodeResource.setUsedResource(deserializeResource(persistenceResource.getUsedResource))
- if (persistenceResource.getCreateTime != null)
+ }
+ if (persistenceResource.getCreateTime != null) {
nodeResource.setCreateTime(persistenceResource.getCreateTime)
- if (persistenceResource.getUpdateTime != null)
+ }
+ if (persistenceResource.getUpdateTime != null) {
nodeResource.setUpdateTime(persistenceResource.getUpdateTime)
+ }
nodeResource.setResourceType(ResourceType.valueOf(persistenceResource.getResourceType))
nodeResource
}
@@ -81,22 +95,30 @@ object ResourceUtils {
if (persistenceResource == null) return null
val nodeResource = new UserResource
if (persistenceResource.getId != null)
nodeResource.setId(persistenceResource.getId)
- if (persistenceResource.getMaxResource != null)
+ if (persistenceResource.getMaxResource != null) {
nodeResource.setMaxResource(deserializeResource(persistenceResource.getMaxResource))
- if (persistenceResource.getMinResource != null)
+ }
+ if (persistenceResource.getMinResource != null) {
nodeResource.setMinResource(deserializeResource(persistenceResource.getMinResource))
- if (persistenceResource.getLockedResource != null)
+ }
+ if (persistenceResource.getLockedResource != null) {
nodeResource.setLockedResource(deserializeResource(persistenceResource.getLockedResource))
- if (persistenceResource.getExpectedResource != null)
+ }
+ if (persistenceResource.getExpectedResource != null) {
nodeResource.setExpectedResource(deserializeResource(persistenceResource.getExpectedResource))
- if (persistenceResource.getLeftResource != null)
+ }
+ if (persistenceResource.getLeftResource != null) {
nodeResource.setLeftResource(deserializeResource(persistenceResource.getLeftResource))
- if (persistenceResource.getUsedResource != null)
+ }
+ if (persistenceResource.getUsedResource != null) {
nodeResource.setUsedResource(deserializeResource(persistenceResource.getUsedResource))
- if (persistenceResource.getCreateTime != null)
+ }
+ if (persistenceResource.getCreateTime != null) {
nodeResource.setCreateTime(persistenceResource.getCreateTime)
- if (persistenceResource.getUpdateTime != null)
+ }
+ if (persistenceResource.getUpdateTime != null) {
nodeResource.setUpdateTime(persistenceResource.getUpdateTime)
+ }
nodeResource.setResourceType(ResourceType.valueOf(persistenceResource.getResourceType))
nodeResource
}
@@ -117,30 +139,35 @@ object ResourceUtils {
if (resourceType.equals(ResourceType.LoadInstance)) {
if (nodeResource.getResourceType.equals(ResourceType.DriverAndYarn)) {
nodeResource.setResourceType(resourceType)
- if (nodeResource.getMaxResource != null)
+ if (nodeResource.getMaxResource != null) {
nodeResource.setMaxResource(
nodeResource.getMaxResource.asInstanceOf[DriverAndYarnResource].loadInstanceResource
)
- if (nodeResource.getMinResource != null)
+ }
+ if (nodeResource.getMinResource != null) {
nodeResource.setMinResource(
nodeResource.getMinResource.asInstanceOf[DriverAndYarnResource].loadInstanceResource
)
- if (nodeResource.getUsedResource != null)
+ }
+ if (nodeResource.getUsedResource != null) {
nodeResource.setUsedResource(
nodeResource.getUsedResource.asInstanceOf[DriverAndYarnResource].loadInstanceResource
)
- if (nodeResource.getLockedResource != null)
+ }
+ if (nodeResource.getLockedResource != null) {
nodeResource.setLockedResource(
nodeResource.getLockedResource
.asInstanceOf[DriverAndYarnResource]
.loadInstanceResource
)
- if (nodeResource.getExpectedResource != null)
+ }
+ if (nodeResource.getExpectedResource != null) {
nodeResource.setExpectedResource(
nodeResource.getExpectedResource
.asInstanceOf[DriverAndYarnResource]
.loadInstanceResource
)
+ }
if (
nodeResource.getLeftResource != null &&
nodeResource.getLeftResource
.isInstanceOf[DriverAndYarnResource]
@@ -170,17 +197,17 @@ object ResourceUtils {
maxResource match {
case maxLoadInstanceResource: LoadInstanceResource =>
val cpuRate =
- if (maxLoadInstanceResource.cores > 0)
+ if (maxLoadInstanceResource.cores > 0) {
(leftLoadInstanceResource.cores * 1.0f) /
maxLoadInstanceResource.cores
- else 1f
+ } else 1f
val memoryRate =
- if (maxLoadInstanceResource.memory > 0)
+ if (maxLoadInstanceResource.memory > 0) {
(leftLoadInstanceResource.memory * 1.0f) /
maxLoadInstanceResource.memory
- else 1f
+ } else 1f
val instanceRate =
- if (maxLoadInstanceResource.instances > 0)
+ if (maxLoadInstanceResource.instances > 0) {
(leftLoadInstanceResource.instances * 1.0f) /
maxLoadInstanceResource.instances
- else 1f
+ } else 1f
Math.min(Math.min(cpuRate, memoryRate), instanceRate)
case _ => 1f
}
diff --git
a/linkis-engineconn-plugins/hive/src/main/scala/org/apache/linkis/engineplugin/hive/executor/HiveEngineConnExecutor.scala
b/linkis-engineconn-plugins/hive/src/main/scala/org/apache/linkis/engineplugin/hive/executor/HiveEngineConnExecutor.scala
index 7a1d119b0..8daa5588e 100644
---
a/linkis-engineconn-plugins/hive/src/main/scala/org/apache/linkis/engineplugin/hive/executor/HiveEngineConnExecutor.scala
+++
b/linkis-engineconn-plugins/hive/src/main/scala/org/apache/linkis/engineplugin/hive/executor/HiveEngineConnExecutor.scala
@@ -234,13 +234,14 @@ class HiveEngineConnExecutor(
val fieldSchemas =
if (hiveResponse.getSchema != null)
hiveResponse.getSchema.getFieldSchemas
- else if (driver.getSchema != null) driver.getSchema.getFieldSchemas
- else
+ else if (driver.getSchema != null) {
+ driver.getSchema.getFieldSchemas
+ } else {
throw HiveQueryFailedException(
GET_FIELD_SCHEMAS_ERROR.getErrorCode,
GET_FIELD_SCHEMAS_ERROR.getErrorDesc
)
-
+ }
LOG.debug("fieldSchemas are " + fieldSchemas)
if (fieldSchemas == null || isNoResultSql(realCode)) {
// IOUtils.closeQuietly(resultSetWriter)
diff --git
a/linkis-engineconn-plugins/io_file/src/main/scala/org/apache/linkis/manager/engineplugin/io/service/FsProxyService.scala
b/linkis-engineconn-plugins/io_file/src/main/scala/org/apache/linkis/manager/engineplugin/io/service/FsProxyService.scala
index 9c8242d21..d530df778 100644
---
a/linkis-engineconn-plugins/io_file/src/main/scala/org/apache/linkis/manager/engineplugin/io/service/FsProxyService.scala
+++
b/linkis-engineconn-plugins/io_file/src/main/scala/org/apache/linkis/manager/engineplugin/io/service/FsProxyService.scala
@@ -29,17 +29,18 @@ class FsProxyService extends Logging {
case StorageConfiguration.HDFS_ROOT_USER.getValue => StorageUtils.HDFS
== fsType
case _ => true // creatorUser.equals(proxyUser)
}
- /* if(creatorUser.equals(proxyUser)){
+ /* if(creatorUser.equals(proxyUser)) {
return true
}
if(creatorUser == StorageConfiguration.STORAGE_ROOT_USER.getValue ) return
t
- if(StorageUtils.FILE == fsType && creatorUser ==
StorageConfiguration.LOCAL_ROOT_USER.getValue){
+ if(StorageUtils.FILE == fsType && creatorUser ==
StorageConfiguration.LOCAL_ROOT_USER.getValue) {
return true
}
- if(StorageUtils.HDFS == fsType && creatorUser ==
StorageConfiguration.HDFS_ROOT_USER.getValue){
+ if(StorageUtils.HDFS == fsType && creatorUser ==
StorageConfiguration.HDFS_ROOT_USER.getValue) {
return true
}
- info(s"$creatorUser Failed to proxy user:$proxyUser of FsType:$fsType")
- true*/
+ info(s"$creatorUser Failed to proxy user:$proxyUser of FsType:$fsType") {
+ true
+ } */
}
diff --git
a/linkis-engineconn-plugins/io_file/src/main/scala/org/apache/linkis/manager/engineplugin/io/utils/IOHelp.scala
b/linkis-engineconn-plugins/io_file/src/main/scala/org/apache/linkis/manager/engineplugin/io/utils/IOHelp.scala
index b5e181cc3..b6f35a2e8 100644
---
a/linkis-engineconn-plugins/io_file/src/main/scala/org/apache/linkis/manager/engineplugin/io/utils/IOHelp.scala
+++
b/linkis-engineconn-plugins/io_file/src/main/scala/org/apache/linkis/manager/engineplugin/io/utils/IOHelp.scala
@@ -62,11 +62,20 @@ object IOHelp {
writer.toString()
} else if (method.params.length == 3) {
val position =
- if (method.params(1).toString.toInt < 0) 0 else
method.params(1).toString.toInt
+ if (method.params(1).toString.toInt < 0) {
+ 0
+ } else {
+ method.params(1).toString.toInt
+ }
val fetchSize =
- if (method.params(2).toString.toInt > maxPageSize) maxPageSize.toInt
- else method.params(2).toString.toInt
- if (position > 0) inputStream.skip(position)
+ if (method.params(2).toString.toInt > maxPageSize) {
+ maxPageSize.toInt
+ } else {
+ method.params(2).toString.toInt
+ }
+ if (position > 0) {
+ inputStream.skip(position)
+ }
val bytes = new Array[Byte](fetchSize)
val len = StorageUtils.readBytes(inputStream, bytes, fetchSize)
val ioMetaData = new IOMetaData(0, len)
@@ -74,8 +83,9 @@ object IOHelp {
writer.addMetaData(ioMetaData)
writer.addRecord(ioRecord)
writer.toString()
- } else
+ } else {
throw new StorageErrorException(PARAMETER_CALLS.getErrorCode,
PARAMETER_CALLS.getErrorDesc)
+ }
}(IOUtils.closeQuietly(inputStream))
}
diff --git
a/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/JDBCEngineConnPlugin.scala
b/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/JDBCEngineConnPlugin.scala
index 2cdced313..d10ebf54c 100644
---
a/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/JDBCEngineConnPlugin.scala
+++
b/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/JDBCEngineConnPlugin.scala
@@ -47,12 +47,12 @@ class JDBCEngineConnPlugin extends EngineConnPlugin {
private val defaultLabels: util.List[Label[_]] = new
util.ArrayList[Label[_]]()
override def init(params: util.Map[String, Any]): Unit = {
- /*val engineTypeLabel = new EngineTypeLabel()
+ /* val engineTypeLabel = new EngineTypeLabel()
engineTypeLabel.setEngineType(EngineType.IO_ENGINE.toString)
engineTypeLabel.setVersion(IOEngineConnConfiguration.DEFAULT_VERSION.getValue)
this.defaultLabels.add(engineTypeLabel)
val runTypeLabel = new CodeLanguageLabel()
- runTypeLabel.setRunType(RunType.IO.toString)*/
+ runTypeLabel.setRunType(RunType.IO.toString) */
}
override def getEngineResourceFactory: EngineResourceFactory = {
diff --git
a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/common/Kind.scala
b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/common/Kind.scala
index 9620048c7..2b678560d 100644
---
a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/common/Kind.scala
+++
b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/common/Kind.scala
@@ -73,11 +73,11 @@ object Kind {
def getRealCode(code: String): String = {
val _code = StringUtils.strip(code)
val kindStr = getKindString(_code)
- if (kindStr.matches("[%|@][a-zA-Z]{1,12}"))
+ if (kindStr.matches("[%|@][a-zA-Z]{1,12}")) {
StringUtils.strip(_code.substring(_code.indexOf(kindStr) +
kindStr.length))
- else if (_code.startsWith(RESTART_CODE))
+ } else if (_code.startsWith(RESTART_CODE)) {
StringUtils.strip(_code.substring(RESTART_CODE.length))
- else _code
+ } else _code
}
/**
diff --git
a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/common/LineBufferedStream.scala
b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/common/LineBufferedStream.scala
index 0b7c48753..f34a06688 100644
---
a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/common/LineBufferedStream.scala
+++
b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/common/LineBufferedStream.scala
@@ -91,7 +91,7 @@ class LineBufferedStream(inputStream: InputStream) extends
Logging {
new LinesIterator
}
- def close = {
+ def close: Unit = {
// thread.continue = false
// thread.interrupt()
// thread.join()
@@ -100,12 +100,12 @@ class LineBufferedStream(inputStream: InputStream)
extends Logging {
IOUtils.closeQuietly(inputStream)
}
- def waitForClose(atMost: Duration) = {
+ def waitForClose(atMost: Duration): Unit = {
Utils.tryQuietly(Utils.waitUntil(() => future.isCompleted, atMost))
close
}
- def waitForComplete = {
+ def waitForComplete: Unit = {
Utils.tryQuietly(Await.result(future, Duration.Inf))
close
}
diff --git
a/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/execution/ExecTaskRunner.scala
b/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/execution/ExecTaskRunner.scala
index 0ea649348..3c6a4cf19 100644
---
a/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/execution/ExecTaskRunner.scala
+++
b/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/execution/ExecTaskRunner.scala
@@ -57,11 +57,15 @@ object ExecTaskRunner extends Logging {
if (execTaskRunnerFactory == null) synchronized {
if (execTaskRunnerFactory == null) {
val factory =
- if
(StringUtils.isNotBlank(OrchestratorConfiguration.EXEC_RUNNER_FACTORY_CLASS.getValue))
+ if (
+
StringUtils.isNotBlank(OrchestratorConfiguration.EXEC_RUNNER_FACTORY_CLASS.getValue)
+ ) {
ClassUtils.getClassInstance[ExecTaskRunnerFactory](
OrchestratorConfiguration.EXEC_RUNNER_FACTORY_CLASS.getValue
)
- else new DefaultExecTaskRunnerFactory
+ } else {
+ new DefaultExecTaskRunnerFactory
+ }
logger.info("Use " + factory.getClass.getName + " to instance a new
execTaskRunnerFactory.")
execTaskRunnerFactory = factory
}
diff --git
a/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/listener/task/TaskInfoEvent.scala
b/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/listener/task/TaskInfoEvent.scala
index 70c68c2aa..2e1d82473 100644
---
a/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/listener/task/TaskInfoEvent.scala
+++
b/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/listener/task/TaskInfoEvent.scala
@@ -74,7 +74,7 @@ case class TaskErrorResponseEvent(execTask: ExecTask,
errorMsg: String)
}
-//case class TaskProgressEvent(execId: ExecTask, progress: Float,
progressInfo: Array[JobProgressInfo]) extends TaskInfoEvent
+// case class TaskProgressEvent(execId: ExecTask, progress: Float,
progressInfo: Array[JobProgressInfo]) extends TaskInfoEvent
case class TaskLogEvent(execTask: ExecTask, log: String)
extends TaskInfoEvent
diff --git
a/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/utils/TreeOperator.scala
b/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/utils/TreeOperator.scala
index 06c74c4fa..781d9af5e 100644
---
a/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/utils/TreeOperator.scala
+++
b/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/utils/TreeOperator.scala
@@ -36,11 +36,11 @@ object TreeOperator {
func: PartialFunction[TreeType, TreeType]
): TreeType = {
val afterTransform = func.applyOrElse(this.asInstanceOf[TreeType],
identity[TreeType])
- /*if (this eq afterTransform) {
+ /* if (this eq afterTransform) {
mapChildren(node,transformChildren(node, func))
} else {
afterTransform.mapChildren(_.transformChildren(func))
- }*/
+ } */
node
}
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-common/src/main/scala/org/apache/linkis/bml/protocol/BmlProtocol.scala
b/linkis-public-enhancements/linkis-bml/linkis-bml-common/src/main/scala/org/apache/linkis/bml/protocol/BmlProtocol.scala
index 55bdb8e10..6f0b4727b 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-common/src/main/scala/org/apache/linkis/bml/protocol/BmlProtocol.scala
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-common/src/main/scala/org/apache/linkis/bml/protocol/BmlProtocol.scala
@@ -25,13 +25,13 @@ trait BmlRequest extends BmlProtocol
abstract class BmlResponse(isSuccess: Boolean) extends BmlProtocol
-//case class BmlUploadRequest() extends BmlRequest
+// case class BmlUploadRequest() extends BmlRequest
//
-//case class BmlDownloadRequest(resourceId:String,
+// case class BmlDownloadRequest(resourceId:String,
// version:String
// ) extends BmlRequest
//
-//case class BmlUpdateRequest(resourceID:String) extends BmlRequest
+// case class BmlUpdateRequest(resourceID:String) extends BmlRequest
case class BmlUploadResponse(isSuccess: Boolean, resourceId: String, version:
String)
extends BmlResponse(isSuccess)
diff --git
a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/rpc/DefaultInsLabelRpcService.scala
b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/rpc/DefaultInsLabelRpcService.scala
index 55a84526d..46088f339 100644
---
a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/rpc/DefaultInsLabelRpcService.scala
+++
b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/rpc/DefaultInsLabelRpcService.scala
@@ -38,7 +38,7 @@ import javax.annotation.{PostConstruct, Resource}
import java.util
-import scala.collection.JavaConversions._
+import scala.collection.JavaConverters._
import scala.collection.JavaConverters.asScalaBufferConverter
@Service
@@ -67,9 +67,9 @@ class DefaultInsLabelRpcService extends InsLabelRpcService
with Logging {
val instance = Option(insLabelAttachRequest.getServiceInstance).getOrElse(
throw new ErrorException(-1, "field 'serviceInstance' in attachRequest
cannot be blank")
)
- val labels = getLabels(labelMap).filter(_ != null)
+ val labels = getLabels(labelMap).asScala.filter(_ != null)
logger.info(s"Start to attach labels[$labels] to instance[$instance]")
- insLabelService.attachLabelsToInstance(labels, instance)
+ insLabelService.attachLabelsToInstance(labels.asJava, instance)
logger.info(s"Success to attach labels[$labels] to instance[$instance]")
}
diff --git
a/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryDetailQueryServiceImpl.scala
b/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryDetailQueryServiceImpl.scala
index 1b5241834..ae0d3b799 100644
---
a/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryDetailQueryServiceImpl.scala
+++
b/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryDetailQueryServiceImpl.scala
@@ -37,7 +37,7 @@ import
org.springframework.transaction.annotation.Transactional
import java.util
-import scala.collection.JavaConversions._
+import scala.collection.JavaConverters._
import scala.collection.JavaConverters.asScalaBufferConverter
class JobHistoryDetailQueryServiceImpl extends JobHistoryDetailQueryService
with Logging {
@@ -138,7 +138,7 @@ class JobHistoryDetailQueryServiceImpl extends
JobHistoryDetailQueryService with
val subJobInfoList = jobReqUpdate.jobInfo
val jobRespList = new util.ArrayList[JobRespProtocol]()
if (subJobInfoList != null) {
- subJobInfoList.foreach(subJobInfo => {
+ subJobInfoList.asScala.foreach(subJobInfo => {
val jobDetail = subJobInfo.getSubJobDetail()
if (null != jobDetail && null != jobDetail.getId) {
logger.info("Update data to the database(往数据库中更新数据)：" +
jobDetail.getId.toString)
diff --git
a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/route/GatewayRouter.scala
b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/route/GatewayRouter.scala
index b54f3204c..78e62edc1 100644
---
a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/route/GatewayRouter.scala
+++
b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/route/GatewayRouter.scala
@@ -45,7 +45,7 @@ trait GatewayRouter {
}
abstract class AbstractGatewayRouter extends GatewayRouter with Logging {
- import scala.collection.JavaConversions._
+ import scala.collection.JavaConverters._
protected val enabledRefresh =
GatewayConfiguration.GATEWAY_SERVER_REFRESH_ENABLED.getValue
protected def findAndRefreshIfNotExists(
@@ -90,7 +90,7 @@ abstract class AbstractGatewayRouter extends GatewayRouter
with Logging {
parsedServiceId: String,
tooManyDeal: List[String] => Option[String]
): Option[String] = {
- val services =
SpringCloudFeignConfigurationCache.getDiscoveryClient.getServices
+ val services =
SpringCloudFeignConfigurationCache.getDiscoveryClient.getServices.asScala
.filter(
_.toLowerCase(Locale.getDefault())
.contains(parsedServiceId.toLowerCase(Locale.getDefault()))
@@ -107,10 +107,10 @@ abstract class AbstractGatewayRouter extends
GatewayRouter with Logging {
): util.List[ServiceInstance] = {
val instancesInRegistry =
ServiceInstanceUtils.getRPCServerLoader.getServiceInstances(serviceId)
- serviceInstances.filter(instance => {
+ serviceInstances.asScala.filter(instance => {
instancesInRegistry.contains(instance)
})
- }
+ }.asJava
protected def removeAllFromRegistry(
serviceId: String,
@@ -118,14 +118,14 @@ abstract class AbstractGatewayRouter extends
GatewayRouter with Logging {
): util.List[ServiceInstance] = {
var serviceInstancesInRegistry =
ServiceInstanceUtils.getRPCServerLoader.getServiceInstances(serviceId)
- serviceInstances.foreach(serviceInstance => {
+ serviceInstances.asScala.foreach(serviceInstance => {
serviceInstancesInRegistry =
serviceInstancesInRegistry.filterNot(_.equals(serviceInstance))
})
if (null == serviceInstancesInRegistry) {
new util.ArrayList[ServiceInstance]()
} else {
serviceInstancesInRegistry.toList
- }
+ }.asJava
}
}
diff --git
a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/UserRestful.scala
b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/UserRestful.scala
index e9486b483..ef0f44cca 100644
---
a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/UserRestful.scala
+++
b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/UserRestful.scala
@@ -38,7 +38,7 @@ import org.apache.commons.net.util.Base64
import java.nio.charset.StandardCharsets
import java.util.{Locale, Random}
-import scala.collection.JavaConversions._
+import scala.collection.JavaConverters._
import com.google.gson.Gson
@@ -93,7 +93,7 @@ abstract class AbstractUserRestful extends UserRestful with
Logging {
val validationCode =
gatewayContext.getRequest.getQueryParams.get("validationCode")(0)
// validate
if (ProxyUserUtils.validate(proxyUser, validationCode)) {
- val lowerCaseUserName = proxyUser.toString.toLowerCase
+ val lowerCaseUserName = proxyUser.toString.toLowerCase(Locale.getDefault)
GatewaySSOUtils.setLoginUser(gatewayContext, lowerCaseUserName)
"代理成功".data("proxyUser", proxyUser)
} else {
@@ -221,7 +221,8 @@ abstract class UserPwdAbstractUserRestful extends
AbstractUserRestful with Loggi
}
def clearExpireCookie(gatewayContext: GatewayContext): Unit = {
- val cookies = gatewayContext.getRequest.getCookies.values().flatMap(cookie
=> cookie).toArray
+ val cookies =
+ gatewayContext.getRequest.getCookies.values().asScala.flatMap(cookie =>
cookie).toArray
val expireCookies = cookies.filter(cookie =>
cookie.getName.equals(ServerConfiguration.LINKIS_SERVER_SESSION_TICKETID_KEY.getValue)
)
diff --git
a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/org/apache/linkis/httpclient/dws/authentication/TokenAuthenticationStrategy.scala
b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/org/apache/linkis/httpclient/dws/authentication/TokenAuthenticationStrategy.scala
index e2a0843b7..867a20329 100644
---
a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/org/apache/linkis/httpclient/dws/authentication/TokenAuthenticationStrategy.scala
+++
b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/org/apache/linkis/httpclient/dws/authentication/TokenAuthenticationStrategy.scala
@@ -38,14 +38,17 @@ class TokenAuthenticationStrategy(override protected val
sessionMaxAliveTime: Lo
case action: UserAction =>
new HttpAuthentication {
- import scala.collection.JavaConversions._
+ import scala.collection.JavaConverters._
import TokenAuthenticationStrategy._
override def authToCookies: Array[Cookie] = Array.empty
override def authToHeaders: util.Map[String, String] =
- Map(TOKEN_USER_KEY -> action.getUser, TOKEN_KEY ->
getClientConfig.getAuthTokenValue)
+ Map(
+ TOKEN_USER_KEY -> action.getUser,
+ TOKEN_KEY -> getClientConfig.getAuthTokenValue
+ ).asJava
override def authToMap: util.Map[String, String] = new
util.HashMap[String, String]()
diff --git
a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/label/RouteLabelParser.scala
b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/label/RouteLabelParser.scala
index 8b2b947cb..3bddda3de 100644
---
a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/label/RouteLabelParser.scala
+++
b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/label/RouteLabelParser.scala
@@ -27,7 +27,7 @@ import org.apache.linkis.server.BDPJettyServerHelper
import java.util
-import scala.collection.JavaConversions._
+import scala.collection.JavaConverters._
trait RouteLabelParser {
@@ -57,7 +57,10 @@ class GenericRoueLabelParser extends RouteLabelParser with
Logging {
case map: util.Map[String, Any] =>
labelBuilderFactory.getLabels(map.asInstanceOf)
case _ => new util.ArrayList[Label[_]]()
}
- labels.filter(label =>
label.isInstanceOf[RouteLabel]).map(_.asInstanceOf[RouteLabel])
+ labels.asScala
+ .filter(label => label.isInstanceOf[RouteLabel])
+ .map(_.asInstanceOf[RouteLabel])
+ .asJava
case _ => null
}
}
diff --git
a/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/scala/org/apache/linkis/gateway/springcloud/websocket/WebsocketGatewaySession.scala
b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/scala/org/apache/linkis/gateway/springcloud/websocket/WebsocketGatewaySession.scala
index 3c2ca7ace..c9c05776d 100644
---
a/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/scala/org/apache/linkis/gateway/springcloud/websocket/WebsocketGatewaySession.scala
+++
b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/scala/org/apache/linkis/gateway/springcloud/websocket/WebsocketGatewaySession.scala
@@ -145,7 +145,7 @@ case class ProxyGatewayWebSocketSession(
) extends GatewayWebSocketSession(webSocketSession) {
private var lastPingTime = System.currentTimeMillis
- override def equals(obj: scala.Any): Boolean = if (obj == null) false
+ override def equals(obj: Any): Boolean = if (obj == null) false
else {
obj match {
case w: ProxyGatewayWebSocketSession =>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
