diff --git a/linkis-engineconn-plugins/elasticsearch/src/main/java/org/apache/linkis/engineplugin/elasticsearch/executor/ElasticSearchEngineConnExecutor.java b/linkis-engineconn-plugins/elasticsearch/src/main/java/org/apache/linkis/engineplugin/elasticsearch/executor/ElasticSearchEngineConnExecutor.java index 418c191b62..4109507f5d 100644 --- a/linkis-engineconn-plugins/elasticsearch/src/main/java/org/apache/linkis/engineplugin/elasticsearch/executor/ElasticSearchEngineConnExecutor.java +++ b/linkis-engineconn-plugins/elasticsearch/src/main/java/org/apache/linkis/engineplugin/elasticsearch/executor/ElasticSearchEngineConnExecutor.java @@ -134,7 +134,7 @@ public ExecuteResponse executeLine(EngineExecutionContext engineExecutorContext, (ElasticSearchTableResponse) elasticSearchResponse; TableMetaData metaData = new TableMetaData(tableResponse.columns()); ResultSetWriter resultSetWriter = - engineExecutorContext.createResultSetWriter(ResultSetFactory.TABLE_TYPE()); + engineExecutorContext.createResultSetWriter(ResultSetFactory.TABLE_TYPE()); resultSetWriter.addMetaData(metaData); Arrays.asList(tableResponse.records()) .forEach( @@ -152,7 +152,7 @@ record -> { } else if (elasticSearchResponse instanceof ElasticSearchJsonResponse) { ElasticSearchJsonResponse jsonResponse = (ElasticSearchJsonResponse) elasticSearchResponse; ResultSetWriter resultSetWriter = - engineExecutorContext.createResultSetWriter(ResultSetFactory.TEXT_TYPE()); + engineExecutorContext.createResultSetWriter(ResultSetFactory.TEXT_TYPE()); resultSetWriter.addMetaData(null); Arrays.stream(jsonResponse.value().split("\\n")) .forEach( diff --git a/linkis-engineconn-plugins/flink/flink-core/src/main/scala/org/apache/linkis/engineconnplugin/flink/launch/FlinkEngineConnLaunchBuilder.scala b/linkis-engineconn-plugins/flink/flink-core/src/main/scala/org/apache/linkis/engineconnplugin/flink/launch/FlinkEngineConnLaunchBuilder.scala index ee15f882b8..a4a77e9a01 100644 --- a/linkis-engineconn-plugins/flink/flink-core/src/main/scala/org/apache/linkis/engineconnplugin/flink/launch/FlinkEngineConnLaunchBuilder.scala +++ b/linkis-engineconn-plugins/flink/flink-core/src/main/scala/org/apache/linkis/engineconnplugin/flink/launch/FlinkEngineConnLaunchBuilder.scala @@ -24,7 +24,6 @@ import org.apache.linkis.hadoop.common.conf.HadoopConf import org.apache.linkis.manager.common.protocol.bml.BmlResource import org.apache.linkis.manager.engineplugin.common.conf.EnvConfiguration import org.apache.linkis.manager.engineplugin.common.launch.entity.EngineConnBuildRequest - import org.apache.linkis.manager.engineplugin.common.launch.process.{ Environment, JavaProcessEngineConnLaunchBuilder @@ -42,6 +41,7 @@ import org.apache.linkis.manager.label.entity.engine.{EngineConnMode, UserCreato import org.apache.linkis.manager.label.utils.LabelUtil import java.util + import scala.collection.JavaConverters._ import com.google.common.collect.Lists @@ -95,9 +95,10 @@ class FlinkEngineConnLaunchBuilder extends JavaProcessEngineConnLaunchBuilder { } bmlResources } + override def getEnvironment(implicit - engineConnBuildRequest: EngineConnBuildRequest - ): util.Map[String, String] = { + engineConnBuildRequest: EngineConnBuildRequest + ): util.Map[String, String] = { val environment = new util.HashMap[String, String] addPathToClassPath(environment, variable(PWD)) val linkisEnvironment = super.getEnvironment @@ -109,8 +110,8 @@ class FlinkEngineConnLaunchBuilder extends JavaProcessEngineConnLaunchBuilder { } override def getEnvironment(implicit - engineConnBuildRequest: EngineConnBuildRequest - ): util.Map[String, String] = { + engineConnBuildRequest: EngineConnBuildRequest + ): util.Map[String, String] = { val environment = new util.HashMap[String, String] addPathToClassPath(environment, variable(PWD)) val linkisEnvironment = super.getEnvironment diff --git a/linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/constant/Constants.scala b/linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/constant/Constants.scala index 0721664d05..1743edac30 100644 --- a/linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/constant/Constants.scala +++ b/linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/constant/Constants.scala @@ -28,10 +28,7 @@ object Constants { CommonVars[String]("linkis.configuration.linkisclient.auth.token.key", "Validation-Code") val AUTH_TOKEN_VALUE: CommonVars[String] = - CommonVars[String]( - "linkis.configuration.linkisclient.auth.token.value", - "LINKIS-AUTH" - ) + CommonVars[String]("linkis.configuration.linkisclient.auth.token.value", "LINKIS-AUTH") val CONNECTION_MAX_SIZE: CommonVars[Int] = CommonVars[Int]("linkis.configuration.linkisclient.connection.max.size", 10) diff --git a/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceClientConf.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceClientConf.scala index 8df9694f8d..e5e1c963e0 100644 --- a/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceClientConf.scala +++ b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceClientConf.scala @@ -37,10 +37,7 @@ object WorkspaceClientConf { CommonVars[String]("wds.linkis.filesystem.token.key", "Validation-Code").getValue val tokenValue: String = - CommonVars[String]( - "wds.linkis.filesystem.token.value", - "LINKIS-AUTH" - ).getValue + CommonVars[String]("wds.linkis.filesystem.token.value", "LINKIS-AUTH").getValue val scriptFromBMLUrl: String = prefix + scriptFromBML }