Merge pull request #404 from JackChen0810/dev-1.0.0

Fix bug #403

Author: liuyou2

dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/impl/ExportDSSOrchestratorPluginImpl.java

@@ -120,6 +120,7 @@ public Map<String, Object> exportOrchestrator(String userName, String workspaceN
                 orchestratorExportRequestRef.setProjectName(projectName);
                 orchestratorExportRequestRef.setUserName(userName);
                 orchestratorExportRequestRef.setWorkspace(workspace);
+                orchestratorExportRequestRef.setDSSLabels(dssLabels);
                 AbstractResponseRef responseRef = (AbstractResponseRef) refExportService.getRefExportOperation().
                     exportRef(orchestratorExportRequestRef);
                 String resourceId = responseRef.getValue("resourceId").toString();

dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/WorkflowNodeServiceImpl.java

@@ -146,11 +146,12 @@ public void deleteNode(String userName, AbstractAppConnNode node) throws Externa
         {
             String label = node.getJobContent().get(DSSCommonUtils.DSS_LABELS_KEY).toString();
             AppInstance appInstance = getAppInstance(appConn, label);
-            RefDeletionOperation refDeletionOperation    = developmentIntegrationStandard.getRefCRUDService(appInstance).getRefDeletionOperation();
+            RefDeletionOperation refDeletionOperation = developmentIntegrationStandard.getRefCRUDService(appInstance).getRefDeletionOperation();
             Workspace workspace = (Workspace) node.getJobContent().get("workspace");
             NodeRequestRef ref = null;
             try {
-                ref = AppConnRefFactoryUtils.newAppConnRef(NodeRequestRef.class, appConn.getClass().getClassLoader(), appConn.getClass().getPackage().getName());
+                ref = AppConnRefFactoryUtils.newAppConnRefByPackageName(NodeRequestRef.class,
+                        appConn.getClass().getClassLoader(), appConn.getClass().getPackage().getName());
             } catch (Exception e) {
                 logger.error("Failed to create DeleteNodeRequestRef", e);
             }
@@ -181,7 +182,8 @@ public Map<String, Object> updateNode(String userName, AbstractAppConnNode node)
             Workspace workspace = (Workspace) node.getJobContent().get("workspace");
             NodeRequestRef ref = null;
             try {
-                ref = AppConnRefFactoryUtils.newAppConnRef(NodeRequestRef.class, appConn.getClass().getClassLoader(), appConn.getClass().getPackage().getName());
+                ref = AppConnRefFactoryUtils.newAppConnRefByPackageName(NodeRequestRef.class,
+                        appConn.getClass().getClassLoader(), appConn.getClass().getPackage().getName());
             } catch (Exception e) {
                 logger.error("Failed to create UpdateNodeRequestRef", e);
             }

dss-standard/development-standard/development-process-standard/src/main/java/com/webank/wedatasphere/dss/standard/app/development/ref/impl/CommonRequestRefImpl.java

@@ -29,13 +29,11 @@
 public  class CommonRequestRefImpl extends AbstractRequestRef implements CommonRequestRef {
 
     protected String userName;
-    protected String name;
     protected Long projectId;
     protected String projectName;
     protected String orcName;
     protected Long orcId;
     protected Workspace workspace;
-    protected String type;
     protected String workspaceName;
     protected List<DSSLabel> dssLabelList;
     protected String contextID;
@@ -50,16 +48,6 @@ public void setUserName(String username) {
         this.userName = username;
     }
 
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public void setName(String name) {
-        this.name = name;
-    }
-
     @Override
     public void setProjectId(Long projectId) {
         this.projectId = projectId;
@@ -110,27 +98,16 @@ public void setWorkspace(Workspace workspace) {
         this.workspace = workspace;
     }
 
-    @Override
-    public String getType() {
-        return type;
-    }
-
-    @Override
-    public void setType(String type) {
-        this.type = type;
-    }
-
     @Override
     public void setWorkspaceName(String workspaceName) {
-     this.workspaceName = workspaceName;
+        this.workspaceName = workspaceName;
     }
 
     @Override
     public String getWorkspaceName() {
         return this.workspaceName;
     }
 
-
     @Override
     public void setDSSLabels(List<DSSLabel> dssLabels) {
         this.dssLabelList = dssLabels;

dss-standard/dss-standard-common/src/main/java/com/webank/wedatasphere/dss/standard/common/entity/ref/AbstractRequestRef.java

@@ -23,8 +23,8 @@
 public abstract class AbstractRequestRef implements RequestRef {
 
     private Map<String, Object> parameters = new HashMap<>();
-    private String name;
-    private String type;
+    protected String name;
+    protected String type;
 
     @Override
     public String getName() {