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/08/20 10:39:05 UTC
[incubator-linkis] branch dev-1.3.0 updated: fix: Scala code format alarm clear in linkis-engineconn-plugin-core (#2908)
This is an automated email from the ASF dual-hosted git repository.
peacewong 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 62abd6873 fix: Scala code format alarm clear in linkis-engineconn-plugin-core (#2908)
62abd6873 is described below
commit 62abd6873ee935a3786609e452598bb08abebe4d
Author: ruY <43...@users.noreply.github.com>
AuthorDate: Sat Aug 20 18:39:00 2022 +0800
fix: Scala code format alarm clear in linkis-engineconn-plugin-core (#2908)
---
.../common/creation/EngineConnFactory.scala | 4 +--
.../exception/EngineConnPluginErrorCode.scala | 4 +--
.../JavaProcessEngineConnLaunchBuilder.scala | 35 +++++++++++---------
.../process/ProcessEngineConnLaunchBuilder.scala | 4 +--
.../loader/entity/EngineConnPluginInfo.scala | 2 ++
.../resource/AbstractEngineResourceFactory.scala | 3 +-
.../common/resource/UserNodeResource.scala | 4 +--
.../loader/entity/EngineConnPluginInfoTest.scala} | 37 ++++++++++------------
8 files changed, 49 insertions(+), 44 deletions(-)
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/creation/EngineConnFactory.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/creation/EngineConnFactory.scala
index bac2c8e16..61cb8a6d9 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/creation/EngineConnFactory.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/creation/EngineConnFactory.scala
@@ -27,7 +27,7 @@ import org.apache.linkis.manager.label.entity.engine.EngineType.EngineType
import java.util
-import scala.collection.JavaConversions.asScalaBuffer
+import scala.collection.JavaConverters._
trait EngineConnFactory {
@@ -77,7 +77,7 @@ trait MultiExecutorEngineConnFactory extends AbstractEngineConnFactory with Logg
protected def getDefaultExecutorFactoryClass: Class[_ <: ExecutorFactory]
protected def getEngineConnModeLabel(labels: util.List[Label[_]]): EngineConnModeLabel =
- labels
+ labels.asScala
.find(_.isInstanceOf[EngineConnModeLabel])
.map(_.asInstanceOf[EngineConnModeLabel])
.orNull
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/exception/EngineConnPluginErrorCode.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/exception/EngineConnPluginErrorCode.scala
index 922d1b55a..5f1537525 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/exception/EngineConnPluginErrorCode.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/exception/EngineConnPluginErrorCode.scala
@@ -19,8 +19,8 @@ package org.apache.linkis.manager.engineplugin.common.exception
object EngineConnPluginErrorCode {
- def INVALID_RUNTYPE = 70101
+ def INVALID_RUNTYPE: Int = 70101
- def INVALID_LABELS = 70102
+ def INVALID_LABELS: Int = 70102
}
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/launch/process/JavaProcessEngineConnLaunchBuilder.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/launch/process/JavaProcessEngineConnLaunchBuilder.scala
index 08c8dd9bb..19004cd23 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/launch/process/JavaProcessEngineConnLaunchBuilder.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/launch/process/JavaProcessEngineConnLaunchBuilder.scala
@@ -37,7 +37,7 @@ import java.io.File
import java.nio.file.Paths
import java.util
-import scala.collection.JavaConversions._
+import scala.collection.JavaConverters._
import scala.collection.mutable.ArrayBuffer
abstract class JavaProcessEngineConnLaunchBuilder
@@ -68,11 +68,12 @@ abstract class JavaProcessEngineConnLaunchBuilder
commandLine += ("-Xmx" + engineConnMemory)
// commandLine += ("-Xms" + engineConnMemory)
val javaOPTS = getExtractJavaOpts
- if (StringUtils.isNotEmpty(EnvConfiguration.ENGINE_CONN_DEFAULT_JAVA_OPTS.getValue))
+ if (StringUtils.isNotEmpty(EnvConfiguration.ENGINE_CONN_DEFAULT_JAVA_OPTS.getValue)) {
EnvConfiguration.ENGINE_CONN_DEFAULT_JAVA_OPTS.getValue
.format(getGcLogDir(engineConnBuildRequest))
.split("\\s+")
.foreach(commandLine += _)
+ }
if (StringUtils.isNotEmpty(javaOPTS)) javaOPTS.split("\\s+").foreach(commandLine += _)
getLogDir(engineConnBuildRequest).trim.split(" ").foreach(commandLine += _)
commandLine += ("-Djava.io.tmpdir=" + variable(TEMP_DIRS))
@@ -114,14 +115,15 @@ abstract class JavaProcessEngineConnLaunchBuilder
addPathToClassPath(environment, Seq(LINKIS_PUBLIC_MODULE_PATH.getValue + "/*"))
}
// finally, add the suitable properties key to classpath
- engineConnBuildRequest.engineConnCreationDesc.properties.foreach { case (key, value) =>
- if (
- key.startsWith("engineconn.classpath") || key.startsWith(
- "wds.linkis.engineconn.classpath"
- )
- ) {
- addPathToClassPath(environment, Seq(variable(PWD), new File(value).getName))
- }
+ engineConnBuildRequest.engineConnCreationDesc.properties.asScala.foreach {
+ case (key, value) =>
+ if (
+ key.startsWith("engineconn.classpath") || key.startsWith(
+ "wds.linkis.engineconn.classpath"
+ )
+ ) {
+ addPathToClassPath(environment, Seq(variable(PWD), new File(value).getName))
+ }
}
getExtraClassPathFile.foreach { file: String =>
addPathToClassPath(environment, Seq(variable(PWD), new File(file).getName))
@@ -137,9 +139,12 @@ abstract class JavaProcessEngineConnLaunchBuilder
}
val configs: util.Map[String, String] =
- richer.getStartupConfigs.filter(_._2.isInstanceOf[String]).map { case (k, v: String) =>
- k -> v
- }
+ richer.getStartupConfigs.asScala
+ .filter(_._2.isInstanceOf[String])
+ .map { case (k, v: String) =>
+ k -> v
+ }
+ .asJava
val jars: String = EnvConfiguration.ENGINE_CONN_JARS.getValue(configs)
addFiles(jars)
val files: String = EnvConfiguration.ENGINE_CONN_CLASSPATH_FILES.getValue(configs)
@@ -167,7 +172,7 @@ abstract class JavaProcessEngineConnLaunchBuilder
override protected def getBmlResources(implicit
engineConnBuildRequest: EngineConnBuildRequest
): util.List[BmlResource] = {
- val engineType = engineConnBuildRequest.labels
+ val engineType = engineConnBuildRequest.labels.asScala
.find(_.isInstanceOf[EngineTypeLabel])
.map { case engineTypeLabel: EngineTypeLabel => engineTypeLabel }
.getOrElse(
@@ -178,7 +183,7 @@ abstract class JavaProcessEngineConnLaunchBuilder
engineConnResource.getConfBmlResource,
engineConnResource.getLibBmlResource
) ++: engineConnResource.getOtherBmlResources.toList
- }
+ }.asJava
private implicit def buildPath(paths: Seq[String]): String =
Paths.get(paths.head, paths.tail: _*).toFile.getPath
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/launch/process/ProcessEngineConnLaunchBuilder.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/launch/process/ProcessEngineConnLaunchBuilder.scala
index 2b932bff1..c913d1f88 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/launch/process/ProcessEngineConnLaunchBuilder.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/launch/process/ProcessEngineConnLaunchBuilder.scala
@@ -27,7 +27,7 @@ import org.apache.linkis.manager.label.entity.engine.UserCreatorLabel
import java.util
-import scala.collection.JavaConversions._
+import scala.collection.JavaConverters._
trait ProcessEngineConnLaunchBuilder extends EngineConnLaunchBuilder {
@@ -66,7 +66,7 @@ trait ProcessEngineConnLaunchBuilder extends EngineConnLaunchBuilder {
}
bmlResources.addAll(getBmlResources)
val environment = getEnvironment
- engineConnBuildRequest.labels
+ engineConnBuildRequest.labels.asScala
.find(_.isInstanceOf[UserCreatorLabel])
.map { case label: UserCreatorLabel =>
CommonProcessEngineConnLaunchRequest(
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/loader/entity/EngineConnPluginInfo.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/loader/entity/EngineConnPluginInfo.scala
index 317b7ff6c..1aaa65ecd 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/loader/entity/EngineConnPluginInfo.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/loader/entity/EngineConnPluginInfo.scala
@@ -42,4 +42,6 @@ case class EngineConnPluginInfo(
}
}
+ override def hashCode(): Int = super.hashCode()
+
}
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/resource/AbstractEngineResourceFactory.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/resource/AbstractEngineResourceFactory.scala
index 1389da4a5..dc42054e3 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/resource/AbstractEngineResourceFactory.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/resource/AbstractEngineResourceFactory.scala
@@ -38,11 +38,12 @@ trait AbstractEngineResourceFactory extends EngineResourceFactory {
val engineResource = new UserNodeResource
val minResource = getMinRequestResource(engineResourceRequest)
val maxResource = getMaxRequestResource(engineResourceRequest)
- if (minResource.getClass != maxResource.getClass)
+ if (minResource.getClass != maxResource.getClass) {
throw new EngineConnPluginErrorException(
70103,
s"The minResource ${minResource.getClass.getSimpleName} is not the same with the maxResource${maxResource.getClass.getSimpleName}."
)
+ }
engineResource.setUser(user)
engineResource.setMinResource(minResource)
engineResource.setResourceType(ResourceUtils.getResourceTypeByResource(minResource))
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/resource/UserNodeResource.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/resource/UserNodeResource.scala
index 351bc3e32..e388ccd8a 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/resource/UserNodeResource.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/resource/UserNodeResource.scala
@@ -35,9 +35,9 @@ class UserNodeResource extends NodeResource {
private var createTime: Date = _
private var updateTime: Date = _
- def getUser = user
+ def getUser: String = user
- def setUser(user: String) = this.user = user
+ def setUser(user: String): Unit = this.user = user
override def getResourceType: ResourceType = resourceType
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/loader/entity/EngineConnPluginInfo.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/test/java/org/apache/linkis/manager/engineplugin/common/loader/entity/EngineConnPluginInfoTest.scala
similarity index 60%
copy from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/loader/entity/EngineConnPluginInfo.scala
copy to linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/test/java/org/apache/linkis/manager/engineplugin/common/loader/entity/EngineConnPluginInfoTest.scala
index 317b7ff6c..9a9ed3028 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/loader/entity/EngineConnPluginInfo.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/test/java/org/apache/linkis/manager/engineplugin/common/loader/entity/EngineConnPluginInfoTest.scala
@@ -17,29 +17,26 @@
package org.apache.linkis.manager.engineplugin.common.loader.entity
+import org.junit.jupiter.api.{DisplayName, Test}
import org.apache.linkis.manager.label.entity.engine.EngineTypeLabel
+import org.junit.jupiter.api.Assertions.assertTrue
-case class EngineConnPluginInfo(
- typeLabel: EngineTypeLabel,
- var resourceUpdateTime: Long = -1L,
- var resourceId: String,
- var resourceVersion: String,
- var classLoader: ClassLoader
-) {
-
- override def toString: String = {
- if (Option(typeLabel).isDefined) {
- typeLabel.toString
- } else {
- null
- }
- }
+class EngineConnPluginInfoTest {
+
+ @Test
+ @DisplayName("testEngineConnPluginInfoEquals")
+ def testEngineConnPluginInfoEquals(): Unit = {
+
+
+ val engineTypeLabel = new EngineTypeLabel
+ engineTypeLabel.setVersion("3.0.1")
+ engineTypeLabel.setEngineType("spark")
+
+
+ val engineConnPluginInfo1 = new EngineConnPluginInfo(engineTypeLabel, -1, "1", "v001", null)
+ val engineConnPluginInfo2 = new EngineConnPluginInfo(engineTypeLabel, -1, "1", "v001", null)
+ assertTrue(engineConnPluginInfo1 == engineConnPluginInfo2)
- override def equals(obj: Any): Boolean = {
- obj match {
- case info: EngineConnPluginInfo => typeLabel.equals(info.typeLabel)
- case _ => super.equals(obj)
- }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org