Adapter for linkis-1.1.0 version.

Author: HmhWz

dss-appconn/appconns/dss-visualis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/visualis/utils/VisualisDownloadAction.java

@@ -13,12 +13,15 @@
  * limitations under the License.
  *
  */
-
 package com.webank.wedatasphere.dss.appconn.visualis.utils;
 
 import org.apache.linkis.httpclient.request.DownloadAction;
 import org.apache.linkis.httpclient.request.GetAction;
 import org.apache.linkis.httpclient.request.UserAction;
+import org.apache.http.HttpResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import scala.Function0;
 
 import java.io.InputStream;
 
@@ -27,11 +30,8 @@ public class VisualisDownloadAction extends GetAction implements DownloadAction,
     private String user;
     private String url;
     private InputStream inputStream;
+    private HttpResponse response;
 
-    @Override
-    public void write(InputStream inputStream) {
-        this.inputStream = inputStream;
-    }
 
     public InputStream getInputStream() {
         return inputStream;
@@ -55,4 +55,68 @@ public void setURL(String url) {
     public String getURL() {
         return url;
     }
-}
+
+
+    @Override
+    public HttpResponse getResponse() {
+        return this.response;
+    }
+
+    @Override
+    public void setResponse(HttpResponse response) {
+        this.response = response;
+    }
+
+
+    @Override
+    public void write(InputStream inputStream) {
+        this.inputStream = inputStream;
+    }
+
+
+    @Override
+    public void write( InputStream inputStream, HttpResponse response) {
+        this.inputStream = inputStream;
+        this.response = response;
+    }
+
+    @Override
+    public void trace(Function0<String> message) {
+    }
+
+    @Override
+    public void debug(Function0<String> message) {
+    }
+
+    @Override
+    public void info(Function0<String> message) {
+    }
+
+    @Override
+    public void info(Function0<String> message, Throwable t) {
+    }
+
+    @Override
+    public void warn(Function0<String> message) {
+    }
+
+    @Override
+    public void warn(Function0<String> message, Throwable t) {
+    }
+
+    @Override
+    public void error( Function0<String> message,  Throwable t) {
+    }
+
+    @Override
+    public void error(Function0<String> message) {
+    }
+
+    @Override
+    public Logger logger() {
+        return LoggerFactory.getLogger(getClass());
+    }
+
+
+
+}

dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/action/ResultSetDownloadAction.scala

@@ -16,20 +16,26 @@
 
 package com.webank.wedatasphere.dss.apiservice.core.action
 
+import org.apache.http.HttpResponse
 import org.apache.linkis.httpclient.request.{DownloadAction, GetAction}
 import org.apache.linkis.ujes.client.request.UJESJobAction
 
 import scala.tools.nsc.interpreter.InputStream
 
 
-
-class ResultSetDownloadAction extends GetAction with  DownloadAction with UJESJobAction  {
+class ResultSetDownloadAction extends GetAction with DownloadAction with UJESJobAction {
 
   private var inputStream: InputStream = _
 
+  private var response: HttpResponse = _
+
   override def write(inputStream: InputStream): Unit = this.inputStream = inputStream
 
   def getInputStream: InputStream = inputStream
 
   override def suffixURLs: Array[String] = Array("filesystem", "resultsetToExcel")
+
+  override def getResponse: HttpResponse = response
+
+  override def setResponse(response: HttpResponse): Unit = this.response = response
 }

dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/entity/request/DeleteExternalNodeRequest.java

@@ -0,0 +1,62 @@
+package com.webank.wedatasphere.dss.workflow.entity.request;
+
+import com.webank.wedatasphere.dss.common.label.LabelRouteVO;
+
+import java.util.Map;
+
+public class DeleteExternalNodeRequest {
+
+    private String name;
+    private String nodeType;
+    private Long projectID;
+    private String description;
+    private LabelRouteVO labels;
+    private Map<String, Object> params;
+
+    public Map<String, Object> getParams() {
+        return params;
+    }
+
+    public void setParams(Map<String, Object> params) {
+        this.params = params;
+    }
+
+    public Long getProjectID() {
+        return projectID;
+    }
+
+    public void setProjectID(Long projectID) {
+        this.projectID = projectID;
+    }
+
+    public String getNodeType() {
+        return nodeType;
+    }
+
+    public void setNodeType(String nodeType) {
+        this.nodeType = nodeType;
+    }
+
+    public LabelRouteVO getLabels() {
+        return labels;
+    }
+
+    public void setLabels(LabelRouteVO labels) {
+        this.labels = labels;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+}

dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/NodeRestfulApi.java

@@ -30,10 +30,7 @@
 import com.webank.wedatasphere.dss.workflow.common.entity.DSSFlow;
 import com.webank.wedatasphere.dss.workflow.cs.DSSCSHelper;
 import com.webank.wedatasphere.dss.workflow.entity.*;
-import com.webank.wedatasphere.dss.workflow.entity.request.AppConnNodeUrlRequest;
-import com.webank.wedatasphere.dss.workflow.entity.request.BatchDeleteAppConnNodeRequest;
-import com.webank.wedatasphere.dss.workflow.entity.request.CreateExternalNodeRequest;
-import com.webank.wedatasphere.dss.workflow.entity.request.UpdateExternalNodeRequest;
+import com.webank.wedatasphere.dss.workflow.entity.request.*;
 import com.webank.wedatasphere.dss.workflow.entity.vo.NodeGroupVO;
 import com.webank.wedatasphere.dss.workflow.entity.vo.NodeInfoVO;
 import com.webank.wedatasphere.dss.workflow.entity.vo.NodeUiVO;
@@ -212,18 +209,18 @@ public Message updateExternalNode(HttpServletRequest req, @RequestBody UpdateExt
     }
 
     @RequestMapping(value = "/deleteAppConnNode",method = RequestMethod.POST)
-    public Message deleteExternalNode(HttpServletRequest req, @RequestBody UpdateExternalNodeRequest updateExternalNodeRequest) throws IllegalAccessException, ExternalOperationFailedException, InstantiationException {
+    public Message deleteExternalNode(HttpServletRequest req, @RequestBody DeleteExternalNodeRequest deleteExternalNodeRequest) throws IllegalAccessException, ExternalOperationFailedException, InstantiationException {
         String userName = SecurityFilter.getLoginUsername(req);
         Workspace workspace = SSOHelper.getWorkspace(req);
-        Long projectID = updateExternalNodeRequest.getProjectID();
-        String nodeType = updateExternalNodeRequest.getNodeType();
-        Map<String, Object> params = updateExternalNodeRequest.getParams();
+        Long projectID = deleteExternalNodeRequest.getProjectID();
+        String nodeType = deleteExternalNodeRequest.getNodeType();
+        Map<String, Object> params = deleteExternalNodeRequest.getParams();
         CommonAppConnNode node = new CommonAppConnNode();
         if(params!=null){
             logger.info("DeletepwdExternalNode request params is " + params + ",nodeType:" + nodeType);
             node.setProjectId(projectID);
             node.setNodeType(nodeType);
-            String label = updateExternalNodeRequest.getLabels().getRoute();
+            String label = deleteExternalNodeRequest.getLabels().getRoute();
             params.put(DSSCommonUtils.DSS_LABELS_KEY, label);
             params.put("workspace", workspace);
             functionInvoker.nodeServiceFunction(userName, params, node, FunctionPool.deleteNode);

pom.xml

@@ -39,7 +39,7 @@
 
     <properties>
         <dss.version>1.0.1</dss.version>
-        <linkis.version>1.0.3</linkis.version>
+        <linkis.version>1.1.0</linkis.version>
         <scala.version>2.11.12</scala.version>
         <jdk.compile.version>1.8</jdk.compile.version>
         <maven.version>3.3.3</maven.version>