Require namespace on all method calls

Signed-off-by: wslulciuc <[email protected]>

Author: wslulciuc

src/main/java/marquez/client/MarquezClient.java

@@ -55,48 +55,34 @@ public class MarquezClient {
   @VisibleForTesting
   static final URL DEFAULT_BASE_URL = Utils.toUrl("http://localhost:8080/api/v1");
 
-  @VisibleForTesting static final String DEFAULT_NAMESPACE_NAME = "default";
-
   @VisibleForTesting static final int DEFAULT_LIMIT = 100;
   @VisibleForTesting static final int DEFAULT_OFFSET = 0;
 
   @VisibleForTesting final MarquezHttp http;
-  @VisibleForTesting final String namespaceName;
 
   public MarquezClient() {
-    this(DEFAULT_BASE_URL, DEFAULT_NAMESPACE_NAME);
-  }
-
-  public MarquezClient(final URL baseUrl) {
-    this(baseUrl, DEFAULT_NAMESPACE_NAME);
+    this(DEFAULT_BASE_URL);
   }
 
-  public MarquezClient(final String namespaceName) {
-    this(DEFAULT_BASE_URL, namespaceName);
+  public MarquezClient(final String baseUrlString) {
+    this(Utils.toUrl(baseUrlString));
   }
 
-  public MarquezClient(final String baseUrlString, final String namespaceName) {
-    this(Utils.toUrl(baseUrlString), namespaceName);
+  public MarquezClient(@NonNull final URL baseUrl) {
+    this(MarquezHttp.create(baseUrl, MarquezClient.Version.get()));
   }
 
-  public MarquezClient(@NonNull final URL baseUrl, final String namespaceName) {
-    this(MarquezHttp.create(baseUrl, MarquezClient.Version.get()), namespaceName);
-  }
-
-  MarquezClient(@NonNull final MarquezHttp http, @NonNull final String namespaceName) {
+  MarquezClient(@NonNull final MarquezHttp http) {
     this.http = http;
-    this.namespaceName = namespaceName;
   }
 
-  public Namespace createNamespace(@NonNull String namespaceName, @NonNull NamespaceMeta meta) {
-    final String bodyAsJson = http.put(http.url("/namespaces/%s", namespaceName), meta.toJson());
+  public Namespace createNamespace(
+      @NonNull String namespaceName, @NonNull NamespaceMeta namespaceMeta) {
+    final String bodyAsJson =
+        http.put(http.url("/namespaces/%s", namespaceName), namespaceMeta.toJson());
     return Namespace.fromJson(bodyAsJson);
   }
 
-  public Namespace getNamespace() {
-    return getNamespace(namespaceName);
-  }
-
   public Namespace getNamespace(@NonNull String namespaceName) {
     final String bodyAsJson = http.get(http.url("/namespaces/%s", namespaceName));
     return Namespace.fromJson(bodyAsJson);
@@ -111,8 +97,8 @@ public List<Namespace> listNamespaces(int limit, int offset) {
     return Namespaces.fromJson(bodyAsJson).getValue();
   }
 
-  public Source createSource(@NonNull String sourceName, @NonNull SourceMeta meta) {
-    final String bodyAsJson = http.put(http.url("/sources/%s", sourceName), meta.toJson());
+  public Source createSource(@NonNull String sourceName, @NonNull SourceMeta sourceMeta) {
+    final String bodyAsJson = http.put(http.url("/sources/%s", sourceName), sourceMeta.toJson());
     return Source.fromJson(bodyAsJson);
   }
 
@@ -121,14 +107,6 @@ public Source getSource(@NonNull String sourceName) {
     return Source.fromJson(bodyAsJson);
   }
 
-  public List<Source> listSources() {
-    return listSources(namespaceName, DEFAULT_LIMIT, DEFAULT_OFFSET);
-  }
-
-  public List<Source> listSources(int limit, int offset) {
-    return listSources(namespaceName, limit, offset);
-  }
-
   public List<Source> listSources(String namespaceName) {
     return listSources(namespaceName, DEFAULT_LIMIT, DEFAULT_OFFSET);
   }
@@ -138,35 +116,23 @@ public List<Source> listSources(@NonNull String namespaceName, int limit, int of
     return Sources.fromJson(bodyAsJson).getValue();
   }
 
-  public Dataset createDataset(String datasetName, DatasetMeta meta) {
-    return createDataset(namespaceName, datasetName, meta);
-  }
-
   public Dataset createDataset(
-      @NonNull String namespaceName, @NonNull String datasetName, @NonNull DatasetMeta meta) {
+      @NonNull String namespaceName,
+      @NonNull String datasetName,
+      @NonNull DatasetMeta datasetMeta) {
     final String bodyAsJson =
-        http.put(http.url("/namespaces/%s/datasets/%s", namespaceName, datasetName), meta.toJson());
+        http.put(
+            http.url("/namespaces/%s/datasets/%s", namespaceName, datasetName),
+            datasetMeta.toJson());
     return Dataset.fromJson(bodyAsJson);
   }
 
-  public Dataset getDataset(String datasetName) {
-    return getDataset(namespaceName, datasetName);
-  }
-
   public Dataset getDataset(@NonNull String namespaceName, @NonNull String datasetName) {
     final String bodyAsJson =
         http.get(http.url("/namespaces/%s/datasets/%s", namespaceName, datasetName));
     return Dataset.fromJson(bodyAsJson);
   }
 
-  public List<Dataset> listDatasets() {
-    return listDatasets(namespaceName, DEFAULT_LIMIT, DEFAULT_OFFSET);
-  }
-
-  public List<Dataset> listDatasets(int limit, int offset) {
-    return listDatasets(namespaceName, limit, offset);
-  }
-
   public List<Dataset> listDatasets(String namespaceName) {
     return listDatasets(namespaceName, DEFAULT_LIMIT, DEFAULT_OFFSET);
   }
@@ -178,10 +144,6 @@ public List<Dataset> listDatasets(@NonNull String namespaceName, int limit, int
     return Datasets.fromJson(bodyAsJson).getValue();
   }
 
-  public Dataset tagDatasetWith(@NonNull String datasetName, @NonNull String tagName) {
-    return tagDatasetWith(namespaceName, datasetName, tagName);
-  }
-
   public Dataset tagDatasetWith(
       @NonNull String namespaceName, @NonNull String datasetName, @NonNull String tagName) {
     final String bodyAsJson =
@@ -190,12 +152,7 @@ public Dataset tagDatasetWith(
     return Dataset.fromJson(bodyAsJson);
   }
 
-  public Dataset tagDatasetFieldWith(
-      @NonNull String datasetName, @NonNull String fieldName, @NonNull String tagName) {
-    return tagDatasetFieldWith(namespaceName, datasetName, fieldName, tagName);
-  }
-
-  public Dataset tagDatasetFieldWith(
+  public Dataset tagFieldWith(
       @NonNull String namespaceName,
       @NonNull String datasetName,
       @NonNull String fieldName,
@@ -208,34 +165,18 @@ public Dataset tagDatasetFieldWith(
     return Dataset.fromJson(bodyAsJson);
   }
 
-  public Job createJob(String jobName, JobMeta meta) {
-    return createJob(namespaceName, jobName, meta);
-  }
-
   public Job createJob(
-      @NonNull String namespaceName, @NonNull String jobName, @NonNull JobMeta meta) {
+      @NonNull String namespaceName, @NonNull String jobName, @NonNull JobMeta jobMeta) {
     final String bodyAsJson =
-        http.put(http.url("/namespaces/%s/jobs/%s", namespaceName, jobName), meta.toJson());
+        http.put(http.url("/namespaces/%s/jobs/%s", namespaceName, jobName), jobMeta.toJson());
     return Job.fromJson(bodyAsJson);
   }
 
-  public Job getJob(String jobName) {
-    return getJob(namespaceName, jobName);
-  }
-
   public Job getJob(@NonNull String namespaceName, @NonNull String jobName) {
     final String bodyAsJson = http.get(http.url("/namespaces/%s/jobs/%s", namespaceName, jobName));
     return Job.fromJson(bodyAsJson);
   }
 
-  public List<Job> listJobs() {
-    return listJobs(namespaceName, DEFAULT_LIMIT, DEFAULT_OFFSET);
-  }
-
-  public List<Job> listJobs(int limit, int offset) {
-    return listJobs(namespaceName, limit, offset);
-  }
-
   public List<Job> listJobs(String namespaceName) {
     return listJobs(namespaceName, DEFAULT_LIMIT, DEFAULT_OFFSET);
   }
@@ -246,25 +187,22 @@ public List<Job> listJobs(@NonNull String namespaceName, int limit, int offset)
     return Jobs.fromJson(bodyAsJson).getValue();
   }
 
-  public Run createRun(String jobName, RunMeta meta) {
-    return createRun(namespaceName, jobName, meta, false);
-  }
-
-  public Run createRun(String namespaceName, String jobName, RunMeta meta) {
-    return createRun(namespaceName, jobName, meta, false);
+  public Run createRun(String namespaceName, String jobName, RunMeta runMeta) {
+    return createRun(namespaceName, jobName, runMeta, false);
   }
 
-  public Run createRun(String jobName, RunMeta meta, boolean markRunAsRunning) {
-    return createRun(namespaceName, jobName, meta, markRunAsRunning);
+  public Run createRunAndStart(String namespaceName, String jobName, RunMeta runMeta) {
+    return createRun(namespaceName, jobName, runMeta, true);
   }
 
-  public Run createRun(
+  private Run createRun(
       @NonNull String namespaceName,
       @NonNull String jobName,
-      @NonNull RunMeta meta,
+      @NonNull RunMeta runMeta,
       boolean markRunAsRunning) {
     final String bodyAsJson =
-        http.post(http.url("/namespaces/%s/jobs/%s/runs", namespaceName, jobName), meta.toJson());
+        http.post(
+            http.url("/namespaces/%s/jobs/%s/runs", namespaceName, jobName), runMeta.toJson());
     final Run run = Run.fromJson(bodyAsJson);
     return (markRunAsRunning) ? markRunAsRunning(run.getId()) : run;
   }
@@ -274,14 +212,6 @@ public Run getRun(@NonNull String runId) {
     return Run.fromJson(bodyAsJson);
   }
 
-  public List<Run> listRuns(String jobName) {
-    return listRuns(namespaceName, jobName, DEFAULT_LIMIT, DEFAULT_OFFSET);
-  }
-
-  public List<Run> listRuns(String jobName, int limit, int offset) {
-    return listRuns(namespaceName, jobName, limit, offset);
-  }
-
   public List<Run> listRuns(String namespaceName, String jobName) {
     return listRuns(namespaceName, jobName, DEFAULT_LIMIT, DEFAULT_OFFSET);
   }
@@ -312,7 +242,7 @@ public Run markRunAs(String runId, @NonNull RunState runState, @Nullable Instant
         return markRunAsFailed(runId, at);
       default:
         throw new IllegalArgumentException(
-            String.format("Unexpected run state type: %s", runState.name()));
+            String.format("Unexpected run state: %s", runState.name()));
     }
   }
 
@@ -380,26 +310,19 @@ public static final class Builder {
 
     private Builder() {
       this.baseUrl = DEFAULT_BASE_URL;
-      this.namespaceName = System.getProperty(NAMESPACE_NAME_ENV_VAR, DEFAULT_NAMESPACE_NAME);
     }
 
-    public Builder baseUrl(@NonNull String baseUrl) {
-      return baseUrl(Utils.toUrl(baseUrl));
+    public Builder baseUrl(@NonNull String baseUrlString) {
+      return baseUrl(Utils.toUrl(baseUrlString));
     }
 
     public Builder baseUrl(@NonNull URL baseUrl) {
       this.baseUrl = baseUrl;
       return this;
     }
 
-    public Builder namespace(@NonNull String namespaceName) {
-      this.namespaceName = namespaceName;
-      return this;
-    }
-
     public MarquezClient build() {
-      return new MarquezClient(
-          MarquezHttp.create(baseUrl, MarquezClient.Version.get()), namespaceName);
+      return new MarquezClient(MarquezHttp.create(baseUrl, MarquezClient.Version.get()));
     }
   }