bug fix

Author: SunPengWan

dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/src/main/scala/com/webank/wedatasphere/dss/appconn/sendemail/emailcontent/parser/AbstractEmailContentParser.scala

@@ -27,7 +27,7 @@ import org.apache.linkis.common.io.resultset.ResultSetReader
 import org.apache.linkis.common.io.{MetaData, Record}
 import org.apache.linkis.common.utils.Utils
 import org.apache.linkis.storage.LineRecord
-import org.apache.linkis.storage.resultset.ResultSetReaderFactory
+import org.apache.linkis.storage.resultset.ResultSetReader
 import org.apache.commons.io.IOUtils
 
 abstract class AbstractEmailContentParser[T] extends EmailContentParser {
@@ -43,7 +43,7 @@ abstract class AbstractEmailContentParser[T] extends EmailContentParser {
   }
 
   protected def getResultSetReader(fsPathStore: FsPathStoreEmailContent): ResultSetReader[_, _ ] = {
-    val reader = ResultSetReaderFactory.getResultSetReader(fsPathStore.getFsPath.getSchemaPath)
+    val reader = ResultSetReader.getResultSetReader(fsPathStore.getFsPath.getSchemaPath)
     reader.getMetaData
     reader
   }

dss-appconn/linkis-appconn-engineplugin/src/main/scala/org/apache/linkis/manager/engineplugin/appconn/executor/AbstractExecutionRequestRefContext.scala

@@ -27,7 +27,7 @@ import org.apache.linkis.manager.engineplugin.appconn.conf.AppConnEngineConnConf
 import org.apache.linkis.rpc.Sender
 import org.apache.linkis.storage.FSFactory
 import org.apache.linkis.storage.fs.FileSystem
-import org.apache.linkis.storage.resultset.{ResultSetFactory, ResultSetReaderFactory}
+import org.apache.linkis.storage.resultset.{ResultSetFactory, ResultSetReader}
 
 abstract class AbstractExecutionRequestRefContext(engineExecutorContext: EngineExecutionContext,
                                                   user: String,
@@ -71,7 +71,7 @@ abstract class AbstractExecutionRequestRefContext(engineExecutorContext: EngineE
 
   override def getResultSetReader[M <: MetaData, R <: Record](fsPath: FsPath): ResultSetReader[M, R] = {
 
-    ResultSetReaderFactory.getResultSetReader(fsPath.getSchemaPath).asInstanceOf[ResultSetReader[M, R]]
+    ResultSetReader.getResultSetReader(fsPath.getSchemaPath).asInstanceOf[ResultSetReader[M, R]]
   }
 
   private def createResultSetWriter[M <: MetaData, R <: Record](resultSetType: String, resultSetAlias: String): ResultSetWriter[M, R] =

dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/service/impl/ApiServiceImpl.java

@@ -491,7 +491,7 @@ private Map<String, String> uploadBml(String userName, String scriptPath, Map<St
             List<Variable> variableList=null;
            if(metadata.entrySet().size() >0) {
                Variable[] v = VariableParser.getVariables(metadata);
-               variableList = Arrays.stream(v).filter(var -> !StringUtils.isEmpty(var.getValue())).collect(Collectors.toList());
+               variableList = Arrays.stream(v).filter(var -> !StringUtils.isEmpty(var.value())).collect(Collectors.toList());
 
            }
            if(variableList!=null) {
@@ -520,7 +520,7 @@ private Map<String, String> updateBml(String userName, String resourceId, String
         try {
             ScriptFsWriter writer = StorageScriptFsWriter.getScriptFsWriter(new FsPath(scriptPath), Consts.UTF_8.toString(), null);
             Variable[] v = VariableParser.getVariables(metadata);
-            List<Variable> variableList = Arrays.stream(v).filter(var -> !StringUtils.isEmpty(var.getValue())).collect(Collectors.toList());
+            List<Variable> variableList = Arrays.stream(v).filter(var -> !StringUtils.isEmpty(var.value())).collect(Collectors.toList());
             writer.addMetaData(new ScriptMetaData(variableList.toArray(new Variable[0])));
             writer.addRecord(new ScriptRecord(scriptContent));
             InputStream inputStream = writer.getInputStream();

dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/service/impl/ApiServiceQueryServiceImpl.java

@@ -45,8 +45,10 @@
 import org.apache.linkis.bml.protocol.BmlDownloadResponse;
 import org.apache.linkis.common.io.FsPath;
 import org.apache.linkis.storage.source.FileSource;
+import org.apache.linkis.storage.source.FileSource$;
 import org.apache.linkis.ujes.client.UJESClient;
 import org.apache.linkis.ujes.client.response.JobExecuteResult;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.math3.util.Pair;
 import org.slf4j.Logger;
@@ -379,10 +381,9 @@ private Pair<Object, ArrayList<String[]>> queryBml(String userName, String resou
 
                     InputStream inputStream = resource.inputStream();
 
-                    try (FileSource fileSource = FileSource.create(new FsPath(scriptPath), inputStream)) {
+                    try (FileSource fileSource = FileSource$.MODULE$.create(new FsPath(scriptPath), inputStream)) {
                         //todo   数组取了第一个
-                        Pair<Object, List<String[]>> sourcePair = fileSource.collect()[0];
-                        collect = new Pair<>(sourcePair.getKey(), new ArrayList<>(sourcePair.getValue()));
+                        collect = fileSource.collect()[0];
                         bmlCache.put(key, collect);
                     }
                 }

plugins/linkis/dss-gateway-support/src/main/scala/org/apache/linkis/gateway/parser/DSSRouteLabelParser.scala

@@ -17,6 +17,7 @@
 package org.apache.linkis.gateway.parser
 
 import org.apache.linkis.gateway.http.GatewayContext
+import org.apache.linkis.gateway.ujes.route.label.RouteLabelParser
 import org.apache.linkis.manager.label.entity.route.RouteLabel
 import org.springframework.stereotype.Component