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/09/03 05:55:57 UTC
[incubator-linkis] branch dev-1.3.1 updated: feat: scala code format alarm clear in linkis-engineconn-plugin-server (#3209)
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 4662d0dc2 feat: scala code format alarm clear in linkis-engineconn-plugin-server (#3209)
4662d0dc2 is described below
commit 4662d0dc2c4bacb4ccb1589dfc5123e12ba7fc14
Author: ruY <43...@users.noreply.github.com>
AuthorDate: Sat Sep 3 13:55:51 2022 +0800
feat: scala code format alarm clear in linkis-engineconn-plugin-server (#3209)
---
.../AbstractEngineConnBmlResourceGenerator.scala | 19 ++++++++++++-------
.../DefaultEngineConnBmlResourceGenerator.scala | 4 ++--
.../service/DefaultEngineConnLaunchService.scala | 4 ++--
.../DefaultEngineConnResourceFactoryService.scala | 5 +++--
.../service/DefaultEngineConnResourceService.scala | 20 +++++++++++---------
5 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/localize/AbstractEngineConnBmlResourceGenerator.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/localize/AbstractEngineConnBmlResourceGenerator.scala
index b46b82455..1304e1087 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/localize/AbstractEngineConnBmlResourceGenerator.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/localize/AbstractEngineConnBmlResourceGenerator.scala
@@ -30,11 +30,12 @@ import java.nio.file.Paths
abstract class AbstractEngineConnBmlResourceGenerator extends EngineConnBmlResourceGenerator {
- if (!new File(getEngineConnsHome).exists)
+ if (!new File(getEngineConnsHome).exists) {
throw new EngineConnPluginErrorException(
20001,
s"Cannot find the home path(${getEngineConnsHome}) of engineConn."
)
+ }
protected def getEngineConnsHome: String = {
ENGINE_CONN_HOME.getValue
@@ -45,11 +46,12 @@ abstract class AbstractEngineConnBmlResourceGenerator extends EngineConnBmlResou
protected def getEngineConnDistHome(engineConnType: String, version: String): String = {
val engineConnDistHome = Paths.get(getEngineConnsHome, engineConnType, "dist").toFile.getPath
- if (!new File(engineConnDistHome).exists())
+ if (!new File(engineConnDistHome).exists()) {
throw new EngineConnPluginErrorException(
20001,
"Cannot find the home path of engineconn dist."
)
+ }
if (StringUtils.isBlank(version) || NO_VERSION_MARK == version) return engineConnDistHome
val engineConnPackageHome = Paths.get(engineConnDistHome, version).toFile.getPath
if (new File(engineConnPackageHome).exists()) engineConnPackageHome
@@ -59,25 +61,28 @@ abstract class AbstractEngineConnBmlResourceGenerator extends EngineConnBmlResou
protected def getEngineConnDistHomeList(engineConnType: String): Array[String] = {
val engineConnDistHome = Paths.get(getEngineConnsHome, engineConnType, "dist").toFile.getPath
val engineConnDistHomeFile = new File(engineConnDistHome)
- if (!engineConnDistHomeFile.exists())
+ if (!engineConnDistHomeFile.exists()) {
throw new EngineConnPluginErrorException(
20001,
"Cannot find the home path of engineconn dist."
)
+ }
val children = engineConnDistHomeFile.listFiles()
- if (children.isEmpty)
+ if (children.isEmpty) {
throw new EngineConnPluginErrorException(
20001,
s"The dist of ${engineConnType}EngineConn is empty."
)
- else if (!children.exists(_.getName.startsWith("v"))) {
+ } else if (!children.exists(_.getName.startsWith("v"))) {
Array(engineConnDistHome)
- } else if (children.forall(_.getName.startsWith("v"))) children.map(_.getPath)
- else
+ } else if (children.forall(_.getName.startsWith("v"))) {
+ children.map(_.getPath)
+ } else {
throw new EngineConnPluginErrorException(
20001,
s"The dist of ${engineConnType}EngineConn is irregular, both the version dir and non-version dir are exist."
)
+ }
}
def getEngineConnTypeListFromDisk: Array[String] =
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/localize/DefaultEngineConnBmlResourceGenerator.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/localize/DefaultEngineConnBmlResourceGenerator.scala
index c582724be..bf3be00e7 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/localize/DefaultEngineConnBmlResourceGenerator.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/localize/DefaultEngineConnBmlResourceGenerator.scala
@@ -56,7 +56,7 @@ class DefaultEngineConnBmlResourceGenerator
new File(path, f.getName.replace(".zip", "")).exists
)
validFiles.map { file =>
- if (file.isFile)
+ if (file.isFile) {
EngineConnLocalizeResourceImpl(
file.getPath,
file.getName,
@@ -64,7 +64,7 @@ class DefaultEngineConnBmlResourceGenerator
file.length()
)
.asInstanceOf[EngineConnLocalizeResource]
- else {
+ } else {
val newFile = new File(path, file.getName + ".zip")
if (newFile.exists() && !newFile.delete()) {
throw new EngineConnPluginErrorException(
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnLaunchService.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnLaunchService.scala
index ab9705fc4..2d131797f 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnLaunchService.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnLaunchService.scala
@@ -37,7 +37,7 @@ import org.apache.commons.lang3.exception.ExceptionUtils
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.stereotype.Component
-import scala.collection.JavaConversions._
+import scala.collection.JavaConverters._
@Component
class DefaultEngineConnLaunchService extends EngineConnLaunchService with Logging {
@@ -62,7 +62,7 @@ class DefaultEngineConnLaunchService extends EngineConnLaunchService with Loggin
override def createEngineConnLaunchRequest(
engineBuildRequest: EngineConnBuildRequest
): EngineConnLaunchRequest = {
- val engineTypeOption = engineBuildRequest.labels.find(_.isInstanceOf[EngineTypeLabel])
+ val engineTypeOption = engineBuildRequest.labels.asScala.find(_.isInstanceOf[EngineTypeLabel])
if (engineTypeOption.isDefined) {
val engineTypeLabel = engineTypeOption.get.asInstanceOf[EngineTypeLabel]
Utils.tryCatch(getEngineLaunchBuilder(engineTypeLabel).buildEngineConn(engineBuildRequest)) {
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnResourceFactoryService.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnResourceFactoryService.scala
index 229824598..e4943ba9f 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnResourceFactoryService.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnResourceFactoryService.scala
@@ -30,7 +30,7 @@ import org.apache.linkis.rpc.message.annotation.Receiver
import org.springframework.stereotype.Component
-import scala.collection.JavaConversions._
+import scala.collection.JavaConverters._
@Component
class DefaultEngineConnResourceFactoryService
@@ -46,7 +46,8 @@ class DefaultEngineConnResourceFactoryService
@Receiver
override def createEngineResource(engineResourceRequest: EngineResourceRequest): NodeResource = {
logger.info(s"To invoke createEngineResource $engineResourceRequest")
- val engineTypeOption = engineResourceRequest.labels.find(_.isInstanceOf[EngineTypeLabel])
+ val engineTypeOption =
+ engineResourceRequest.labels.asScala.find(_.isInstanceOf[EngineTypeLabel])
if (engineTypeOption.isDefined) {
val engineTypeLabel = engineTypeOption.get.asInstanceOf[EngineTypeLabel]
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnResourceService.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnResourceService.scala
index 1c8614dcd..0823ef6fc 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnResourceService.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnResourceService.scala
@@ -44,7 +44,7 @@ import javax.annotation.PostConstruct
import java.util.Date
-import scala.collection.JavaConversions._
+import scala.collection.JavaConverters._
@Component
class DefaultEngineConnResourceService extends EngineConnResourceService with Logging {
@@ -164,7 +164,7 @@ class DefaultEngineConnResourceService extends EngineConnResourceService with Lo
engineConnType: String,
version: String
): Unit = {
- val engineConnBmlResources = asScalaBuffer(
+ val engineConnBmlResources = asScalaBufferConverter(
engineConnBmlResourceDao.getAllEngineConnBmlResource(engineConnType, version)
)
if (
@@ -172,13 +172,14 @@ class DefaultEngineConnResourceService extends EngineConnResourceService with Lo
localizeResource.fileName == LaunchConstants.ENGINE_CONN_CONF_DIR_NAME + ".zip" ||
localizeResource.fileName == LaunchConstants.ENGINE_CONN_LIB_DIR_NAME + ".zip"
) < 2
- )
+ ) {
throw new EngineConnPluginErrorException(
20001,
s"The `lib` and `conf` dir is necessary in ${engineConnType}EngineConn dist."
)
+ }
localize.foreach { localizeResource =>
- val resource = engineConnBmlResources.find(_.getFileName == localizeResource.fileName)
+ val resource = engineConnBmlResources.asScala.find(_.getFileName == localizeResource.fileName)
if (resource.isEmpty) {
logger.info(
s"Ready to upload a new bmlResource for ${engineConnType}EngineConn-$version. path: " + localizeResource.fileName
@@ -210,10 +211,11 @@ class DefaultEngineConnResourceService extends EngineConnResourceService with Lo
engineConnBmlResource.setFileSize(localizeResource.fileSize)
engineConnBmlResource.setLastModified(localizeResource.lastModified)
engineConnBmlResourceDao.update(engineConnBmlResource)
- } else
+ } else {
logger.info(
s"The file has no change in ${engineConnType}EngineConn-$version, path: " + localizeResource.fileName
)
+ }
}
}
@@ -223,18 +225,18 @@ class DefaultEngineConnResourceService extends EngineConnResourceService with Lo
): EngineConnResource = {
val engineConnType = engineConnBMLResourceRequest.getEngineConnType
val version = engineConnBMLResourceRequest.getVersion
- val engineConnBmlResources = asScalaBuffer(
+ val engineConnBmlResources = asScalaBufferConverter(
engineConnBmlResourceDao.getAllEngineConnBmlResource(engineConnType, "v" + version)
)
- val confBmlResource = engineConnBmlResources
+ val confBmlResource = engineConnBmlResources.asScala
.find(_.getFileName == LaunchConstants.ENGINE_CONN_CONF_DIR_NAME + ".zip")
.map(parseToBmlResource)
.get
- val libBmlResource = engineConnBmlResources
+ val libBmlResource = engineConnBmlResources.asScala
.find(_.getFileName == LaunchConstants.ENGINE_CONN_LIB_DIR_NAME + ".zip")
.map(parseToBmlResource)
.get
- val otherBmlResources = engineConnBmlResources
+ val otherBmlResources = engineConnBmlResources.asScala
.filterNot(r =>
r.getFileName == LaunchConstants.ENGINE_CONN_CONF_DIR_NAME + ".zip" ||
r.getFileName == LaunchConstants.ENGINE_CONN_LIB_DIR_NAME + ".zip"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org