pass flow id instead of flow obj

Author: Yang Guo

Makefile

@@ -1,9 +1,9 @@
 
 
 MVN_CLEAN    	:= mvn clean
-MVN_BUILD    	:= mvn clean compile
-MVN_PKG	    	:= mvn clean package -Dmaven.test.skip=true
-MVN_TEST		:= mvn clean test
+MVN_BUILD    	:= mvn compile -T 4C
+MVN_PKG	    	:= mvn package -T 4C -Dmaven.test.skip=true
+MVN_TEST		:= mvn test -T 4C
 
 
 CURRENT_DIR 	:= $(shell pwd)

core/src/main/java/com/flowci/core/api/service/OpenRestServiceImpl.java

@@ -111,7 +111,7 @@ public List<User> users(String flowName) {
 
     private Job getJob(String name, long number) {
         Flow flow = flowService.get(name);
-        String key = JobKeyBuilder.build(flow, number);
+        String key = JobKeyBuilder.build(flow.getId(), number);
         Optional<Job> optional = jobDao.findByKey(key);
 
         if (optional.isPresent()) {

core/src/main/java/com/flowci/core/job/JobController.java

@@ -103,12 +103,12 @@ public Job get(@PathVariable("flow") String name, @PathVariable String buildNumb
         Flow flow = flowService.get(name);
 
         if (ParameterLatest.equals(buildNumberOrLatest)) {
-            return jobService.getLatest(flow);
+            return jobService.getLatest(flow.getId());
         }
 
         try {
             long buildNumber = Long.parseLong(buildNumberOrLatest);
-            return jobService.get(flow, buildNumber);
+            return jobService.get(flow.getId(), buildNumber);
         } catch (NumberFormatException e) {
             throw new ArgumentException("Build number must be a integer");
         }

core/src/main/java/com/flowci/core/job/service/JobService.java

@@ -37,7 +37,7 @@ public interface JobService {
     /**
      * Get job by flow and build number
      */
-    Job get(Flow flow, Long buildNumber);
+    Job get(String flowId, Long buildNumber);
 
     /**
      * Get job yml by job
@@ -47,7 +47,7 @@ public interface JobService {
     /**
      * Get latest job
      */
-    Job getLatest(Flow flow);
+    Job getLatest(String flowId);
 
     /**
      * List job with fields only shown on the list

core/src/main/java/com/flowci/core/job/service/JobServiceImpl.java

@@ -161,16 +161,16 @@ public Job get(String jobId) {
     }
 
     @Override
-    public Job get(Flow flow, Long buildNumber) {
-        String key = JobKeyBuilder.build(flow, buildNumber);
+    public Job get(String flowId, Long buildNumber) {
+        String key = JobKeyBuilder.build(flowId, buildNumber);
         Optional<Job> optional = jobDao.findByKey(key);
 
         if (optional.isPresent()) {
             return optional.get();
         }
 
         throw new NotFoundException(
-                "The job {0} for build number {1} cannot found", flow.getName(), Long.toString(buildNumber));
+                "The flow {0} for build number {1} cannot found", flowId, Long.toString(buildNumber));
     }
 
     @Override
@@ -179,15 +179,15 @@ public JobYml getYml(Job job) {
     }
 
     @Override
-    public Job getLatest(Flow flow) {
-        Optional<JobNumber> optional = jobNumberDao.findById(flow.getId());
+    public Job getLatest(String flowId) {
+        Optional<JobNumber> optional = jobNumberDao.findById(flowId);
 
         if (optional.isPresent()) {
             JobNumber latest = optional.get();
-            return get(flow, latest.getNumber());
+            return get(flowId, latest.getNumber());
         }
 
-        throw new NotFoundException("No jobs for flow {0}", flow.getName());
+        throw new NotFoundException("No jobs for flow {0}", flowId);
     }
 
     @Override
@@ -311,7 +311,7 @@ private Job createJob(Flow flow, Trigger trigger, StringVars input) {
 
         // create job
         Job job = new Job();
-        job.setKey(JobKeyBuilder.build(flow, jobNumber.getNumber()));
+        job.setKey(JobKeyBuilder.build(flow.getId(), jobNumber.getNumber()));
         job.setFlowId(flow.getId());
         job.setTrigger(trigger);
         job.setBuildNumber(jobNumber.getNumber());

core/src/main/java/com/flowci/core/job/util/JobKeyBuilder.java

@@ -16,16 +16,14 @@
 
 package com.flowci.core.job.util;
 
-import com.flowci.core.flow.domain.Flow;
-
 /**
  * @author yang
  */
 public abstract class JobKeyBuilder {
 
     private final static char Splitter = '-';
 
-    public static String build(Flow flow, Long buildNumber) {
-        return flow.getId() + Splitter + buildNumber;
+    public static String build(String flowId, Long buildNumber) {
+        return flowId + Splitter + buildNumber;
     }
 }

domain/src/main/java/com/flowci/domain/ExecutedCmd.java

@@ -16,25 +16,19 @@
 
 package com.flowci.domain;
 
-import static com.flowci.domain.ExecutedCmd.Status.EXCEPTION;
-import static com.flowci.domain.ExecutedCmd.Status.KILLED;
-import static com.flowci.domain.ExecutedCmd.Status.PENDING;
-import static com.flowci.domain.ExecutedCmd.Status.RUNNING;
-import static com.flowci.domain.ExecutedCmd.Status.SKIPPED;
-import static com.flowci.domain.ExecutedCmd.Status.SUCCESS;
-import static com.flowci.domain.ExecutedCmd.Status.TIMEOUT;
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.google.common.collect.ImmutableSet;
-import java.util.Date;
-import java.util.Objects;
-import java.util.Set;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import java.util.Date;
+import java.util.Set;
+
+import static com.flowci.domain.ExecutedCmd.Status.*;
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * ExecutedCmd == Step node with executed status and data
  *
@@ -50,14 +44,14 @@ public class ExecutedCmd extends CmdBase {
     public final static Integer CODE_SUCCESS = 0;
 
     private final static Set<Status> FailureStatus = ImmutableSet.of(
-        EXCEPTION,
-        KILLED,
-        TIMEOUT
+            EXCEPTION,
+            KILLED,
+            TIMEOUT
     );
 
     private final static Set<Status> SuccessStatus = ImmutableSet.of(
-        SUCCESS,
-        SKIPPED
+            SUCCESS,
+            SKIPPED
     );
 
     public enum Status {