Skip to content
This repository has been archived by the owner on Jul 23, 2024. It is now read-only.

Use the WorkFlowStatus instance instead of name() #293

Merged
merged 1 commit into from
May 1, 2023
Merged

Use the WorkFlowStatus instance instead of name() #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions parodos-model-api/src/main/java/com/redhat/parodos/workflow/enums/WorkFlowStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,4 @@ public enum WorkFlowStatus {

FAILED, IN_PROGRESS, COMPLETED, PENDING, REJECTED;

public boolean isFailed() {
return FAILED.name().equals(name());
}

public boolean isRejected() {
return REJECTED.name().equals(name());
}

}
4 changes: 2 additions & 2 deletions ...at/parodos/workflow/execution/aspect/AssessmentInfrastructureWorkFlowPostInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@ public WorkReport handlePostWorkFlowExecution() {
.collect(Collectors.toList());

for (WorkFlowExecution checkerExecution : checkerExecutions)
if (checkerExecution != null && checkerExecution.getStatus().isRejected()) {
if (checkerExecution != null && checkerExecution.getStatus() == WorkFlowStatus.FAILED) {
log.info("fail workflow: {} because it has declined checker(s)", workFlowDefinition.getName());
workFlowExecution.setStatus(WorkFlowStatus.FAILED);
report = new DefaultWorkReport(WorkStatus.FAILED, workContext);
break;
}
else if (checkerExecution == null || checkerExecution.getStatus().isFailed()) {
else if (checkerExecution == null || checkerExecution.getStatus() == WorkFlowStatus.FAILED) {
log.info("workflow: {} has a pending/running checker: {}", workFlowDefinition.getName(),
checkerExecution == null ? "checker is pending"
: checkerExecution.getWorkFlowDefinitionId().toString());
Expand Down