Add runID to job meta

Signed-off-by: wslulciuc <willy@datakin.com>
MarquezProject · Oct 14, 2020 · 12b02e4 · 12b02e4
1 parent a63a087
commit 12b02e4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/main/java/marquez/api/JobResource.java b/src/main/java/marquez/api/JobResource.java
@@ -84,6 +84,7 @@ public Response createOrUpdate(
       @Valid JobMeta jobMeta)
       throws MarquezServiceException {
     throwIfNotExists(namespaceName);
+    throwIfNotExists(jobMeta.getRunId().orElse(null));
 
     final Job job = jobService.createOrUpdate(namespaceName, jobName, jobMeta);
     return Response.ok(job).build();
@@ -264,9 +265,11 @@ void throwIfExists(
     }
   }
 
-  void throwIfNotExists(@NonNull RunId runId) throws MarquezServiceException {
-    if (!jobService.runExists(runId)) {
-      throw new RunNotFoundException(runId);
+  void throwIfNotExists(@Nullable RunId runId) throws MarquezServiceException {
+    if (runId != null) {
+      if (!jobService.runExists(runId)) {
+        throw new RunNotFoundException(runId);
+      }
     }
   }
 

diff --git a/src/main/java/marquez/service/models/JobMeta.java b/src/main/java/marquez/service/models/JobMeta.java
@@ -35,6 +35,7 @@
 import marquez.common.models.JobName;
 import marquez.common.models.JobType;
 import marquez.common.models.NamespaceName;
+import marquez.common.models.RunId;
 
 @EqualsAndHashCode
 @ToString
@@ -45,20 +46,23 @@ public final class JobMeta {
   @Nullable private final URL location;
   @Getter private final ImmutableMap<String, String> context;
   @Nullable private final String description;
+  @Nullable private final RunId runId;
 
   public JobMeta(
       @NonNull final JobType type,
       @NonNull final ImmutableSet<DatasetId> inputs,
       @NonNull final ImmutableSet<DatasetId> outputs,
       @Nullable final URL location,
       @Nullable final ImmutableMap<String, String> context,
-      @Nullable final String description) {
+      @Nullable final String description,
+      @Nullable final RunId runId) {
     this.type = type;
     this.inputs = inputs;
     this.outputs = outputs;
     this.location = location;
     this.context = (context == null) ? ImmutableMap.of() : context;
     this.description = description;
+    this.runId = runId;
   }
 
   public Optional<URL> getLocation() {
@@ -69,6 +73,10 @@ public Optional<String> getDescription() {
     return Optional.ofNullable(description);
   }
 
+  public Optional<RunId> getRunId() {
+    return Optional.ofNullable(runId);
+  }
+
   public Version version(@NonNull NamespaceName namespaceName, @NonNull JobName jobName) {
     final byte[] bytes =
         VERSION_JOINER