Skip to content

Commit aeba9d8

Browse files
Add the ability of supporting flowName and flowId to RefCopyOperation and QueryJumpUrlOperation.
1 parent 43c22b0 commit aeba9d8

File tree

3 files changed

+37
-1
lines changed

3 files changed

+37
-1
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,13 +138,16 @@ private <K extends DevelopmentRequestRef, V extends ResponseRef> V tryNodeOperat
138138
return DevelopmentOperationUtils.tryDevelopmentOperation(() -> developmentServiceFunction.apply(appConn, node.getDssLabels()),
139139
developmentOperationFunction,
140140
dssJobContentRequestRef -> {
141-
dssJobContentRequestRef.setDSSJobContent(new HashMap<>(node.getParams()));
141+
dssJobContentRequestRef.setDSSJobContent(new HashMap<>());
142142
String orcVersion;
143143
try {
144144
orcVersion = getOrcVersion(node.getFlowId());
145145
} catch (Exception e) {
146146
throw new ExternalOperationFailedException(50205, "get workflow version failed.", e);
147147
}
148+
if(node.getParams() != null) {
149+
dssJobContentRequestRef.getDSSJobContent().putAll(node.getParams());
150+
}
148151
dssJobContentRequestRef.getDSSJobContent().put(DSSJobContentConstant.ORC_VERSION_KEY, orcVersion);
149152
dssJobContentRequestRef.getDSSJobContent().put(DSSJobContentConstant.ORCHESTRATION_ID, node.getFlowId());
150153
dssJobContentRequestRef.getDSSJobContent().put(DSSJobContentConstant.ORCHESTRATION_NAME, node.getFlowName());

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,18 @@ class RefJobContentWithContextRequestRef extends DevelopmentRequestRefImpl<RefJo
3030
class CopyRequestRefImpl extends DevelopmentRequestRefImpl<CopyRequestRefImpl>
3131
implements CopyRequestRef<CopyRequestRefImpl> {}
3232

33+
class CopyWithDSSJobContentRequestRefImpl extends DevelopmentRequestRefImpl<CopyWithDSSJobContentRequestRefImpl>
34+
implements CopyRequestRef<CopyWithDSSJobContentRequestRefImpl>, DSSJobContentRequestRef<CopyWithDSSJobContentRequestRefImpl> {}
35+
3336
class CopyWitContextRequestRefImpl extends DevelopmentRequestRefImpl<CopyWitContextRequestRefImpl>
3437
implements CopyRequestRef<CopyWitContextRequestRefImpl>,
3538
DSSContextRequestRef<CopyWitContextRequestRefImpl> {}
3639

40+
class CopyWitContextAndDSSJobContentRequestRefImpl extends DevelopmentRequestRefImpl<CopyWitContextAndDSSJobContentRequestRefImpl>
41+
implements CopyRequestRef<CopyWitContextAndDSSJobContentRequestRefImpl>,
42+
DSSContextRequestRef<CopyWitContextAndDSSJobContentRequestRefImpl>,
43+
DSSJobContentRequestRef<CopyWitContextAndDSSJobContentRequestRefImpl>{}
44+
3745
class ImportRequestRefImpl extends DevelopmentRequestRefImpl<ImportRequestRefImpl>
3846
implements ImportRequestRef<ImportRequestRefImpl> {}
3947

@@ -70,4 +78,12 @@ class QueryJumpUrlRequestRefImpl extends DevelopmentRequestRefImpl<QueryJumpUrlR
7078
class QueryJumpUrlWithContextRequestRefImpl extends DevelopmentRequestRefImpl<QueryJumpUrlWithContextRequestRefImpl>
7179
implements QueryJumpUrlRequestRef<QueryJumpUrlWithContextRequestRefImpl>,
7280
DSSContextRequestRef<QueryJumpUrlWithContextRequestRefImpl> {}
81+
82+
class QueryJumpUrlWithDSSJobContentRequestRefImpl extends DevelopmentRequestRefImpl<QueryJumpUrlWithDSSJobContentRequestRefImpl>
83+
implements QueryJumpUrlRequestRef<QueryJumpUrlWithDSSJobContentRequestRefImpl>, DSSJobContentRequestRef<QueryJumpUrlWithDSSJobContentRequestRefImpl> {}
84+
85+
class QueryJumpUrlWithContextAndDSSJobContentRequestRefImpl extends DevelopmentRequestRefImpl<QueryJumpUrlWithContextAndDSSJobContentRequestRefImpl>
86+
implements QueryJumpUrlRequestRef<QueryJumpUrlWithContextAndDSSJobContentRequestRefImpl>,
87+
DSSContextRequestRef<QueryJumpUrlWithContextAndDSSJobContentRequestRefImpl>,
88+
DSSJobContentRequestRef<QueryJumpUrlWithContextAndDSSJobContentRequestRefImpl>{}
7389
}

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,19 @@ class RefJobContentWithContextRequestRef extends DevelopmentRequestRefImpl<RefJo
3434
class CopyRequestRefImpl extends DevelopmentRequestRefImpl<CopyRequestRefImpl>
3535
implements CopyRequestRef<CopyRequestRefImpl>, ProjectRefRequestRef<CopyRequestRefImpl> {}
3636

37+
class CopyWithDSSJobContentRequestRefImpl extends DevelopmentRequestRefImpl<CopyWithDSSJobContentRequestRefImpl>
38+
implements CopyRequestRef<CopyWithDSSJobContentRequestRefImpl>, ProjectRefRequestRef<CopyWithDSSJobContentRequestRefImpl>,
39+
DSSJobContentRequestRef<CopyWithDSSJobContentRequestRefImpl> {}
40+
3741
class CopyWitContextRequestRefImpl extends DevelopmentRequestRefImpl<CopyWitContextRequestRefImpl>
3842
implements CopyRequestRef<CopyWitContextRequestRefImpl>, ProjectRefRequestRef<CopyWitContextRequestRefImpl>,
3943
DSSContextRequestRef<CopyWitContextRequestRefImpl> {}
4044

45+
class CopyWitContextAndDSSJobContentRequestRefImpl extends DevelopmentRequestRefImpl<CopyWitContextAndDSSJobContentRequestRefImpl>
46+
implements CopyRequestRef<CopyWitContextAndDSSJobContentRequestRefImpl>,
47+
DSSContextRequestRef<CopyWitContextAndDSSJobContentRequestRefImpl>, ProjectRefRequestRef<CopyWitContextAndDSSJobContentRequestRefImpl>,
48+
DSSJobContentRequestRef<CopyWitContextAndDSSJobContentRequestRefImpl>{}
49+
4150
class ImportRequestRefImpl extends DevelopmentRequestRefImpl<ImportRequestRefImpl>
4251
implements ImportRequestRef<ImportRequestRefImpl>, ProjectRefRequestRef<ImportRequestRefImpl> {}
4352

@@ -75,4 +84,12 @@ class QueryJumpUrlRequestRefImpl extends DevelopmentRequestRefImpl<QueryJumpUrlR
7584
class QueryJumpUrlWithContextRequestRefImpl extends DevelopmentRequestRefImpl<QueryJumpUrlWithContextRequestRefImpl>
7685
implements QueryJumpUrlRequestRef<QueryJumpUrlWithContextRequestRefImpl>, ProjectRefRequestRef<QueryJumpUrlWithContextRequestRefImpl>,
7786
DSSContextRequestRef<QueryJumpUrlWithContextRequestRefImpl> {}
87+
88+
class QueryJumpUrlWithDSSJobContentRequestRefImpl extends DevelopmentRequestRefImpl<QueryJumpUrlWithDSSJobContentRequestRefImpl>
89+
implements QueryJumpUrlRequestRef<QueryJumpUrlWithDSSJobContentRequestRefImpl>, ProjectRefRequestRef<QueryJumpUrlWithDSSJobContentRequestRefImpl>,
90+
DSSJobContentRequestRef<QueryJumpUrlWithDSSJobContentRequestRefImpl>{}
91+
92+
class QueryJumpUrlWithContextAndDSSJobContentRequestRefImpl extends DevelopmentRequestRefImpl<QueryJumpUrlWithContextAndDSSJobContentRequestRefImpl>
93+
implements QueryJumpUrlRequestRef<QueryJumpUrlWithContextAndDSSJobContentRequestRefImpl>, ProjectRefRequestRef<QueryJumpUrlWithContextAndDSSJobContentRequestRefImpl>,
94+
DSSContextRequestRef<QueryJumpUrlWithContextAndDSSJobContentRequestRefImpl>, DSSJobContentRequestRef<QueryJumpUrlWithContextAndDSSJobContentRequestRefImpl> {}
7895
}

0 commit comments

Comments
 (0)