Fixed Issue #358: rename class job

src/main/java/marquez/api/mappers/ApiJobToCoreJobMapper.java

@@ -14,12 +14,12 @@
 
 package marquez.api.mappers;
 
-import marquez.api.models.Job;
+import marquez.api.models.JobResponse;
 
-public class ApiJobToCoreJobMapper extends Mapper<Job, marquez.service.models.Job> {
+public class ApiJobToCoreJobMapper extends Mapper<JobResponse, marquez.service.models.JobResponse> {
   @Override
-  public marquez.service.models.Job map(Job value) {
-    return new marquez.service.models.Job(
+  public marquez.service.models.JobResponse map(JobResponse value) {
+    return new marquez.service.models.JobResponse(
         null,
         value.getName(),
         value.getLocation(),

src/main/java/marquez/api/mappers/CoreJobToApiJobMapper.java

@@ -14,12 +14,12 @@
 
 package marquez.api.mappers;
 
-import marquez.api.models.Job;
+import marquez.api.models.JobResponse;
 
-public class CoreJobToApiJobMapper extends Mapper<marquez.service.models.Job, Job> {
+public class CoreJobToApiJobMapper extends Mapper<marquez.service.models.JobResponse, JobResponse> {
   @Override
-  public Job map(marquez.service.models.Job value) {
-    return new Job(
+  public JobResponse map(marquez.service.models.JobResponse value) {
+    return new JobResponse(
         value.getName(),
         value.getCreatedAt(),
         value.getInputDatasetUrns(),

src/main/java/marquez/api/models/Job.java → src/main/java/marquez/api/models/JobResponse.java

@@ -23,7 +23,7 @@
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public final class Job {
+public final class JobResponse {
   private String name;
 
   private Timestamp createdAt;

src/main/java/marquez/api/models/JobsResponse.java

@@ -24,5 +24,5 @@
 @NoArgsConstructor
 @AllArgsConstructor
 public class JobsResponse {
-  @Getter private List<Job> jobs;
+  @Getter private List<JobsResponse> jobs;
 }

src/main/java/marquez/api/resources/JobResource.java

@@ -42,7 +42,7 @@
 import marquez.service.JobService;
 import marquez.service.NamespaceService;
 import marquez.service.exceptions.MarquezServiceException;
-import marquez.service.models.Job;
+import marquez.service.models.JobResponse;
 import marquez.service.models.JobRun;
 import marquez.service.models.JobRunState;
 
@@ -76,17 +76,17 @@ public Response create(
       if (!namespaceService.exists(namespace)) {
         return Response.status(Response.Status.NOT_FOUND).build();
       }
-      final Job jobToCreate =
+      final JobResponse jobToCreate =
           apiJobToCoreJobMapper.map(
-              new marquez.api.models.Job(
+              new marquez.api.models.JobResponse(
                   job,
                   null,
                   request.getInputDatasetUrns(),
                   request.getOutputDatasetUrns(),
                   request.getLocation(),
                   request.getDescription().orElse(null)));
       jobToCreate.setNamespaceGuid(namespaceService.get(namespace).get().getGuid());
-      final Job createdJob = jobService.createJob(namespace, jobToCreate);
+      final JobResponse createdJob = jobService.createJob(namespace, jobToCreate);
       return Response.status(Response.Status.CREATED)
           .entity(coreJobToApiJobMapper.map(createdJob))
           .build();
@@ -107,7 +107,7 @@ public Response getJob(
       if (!namespaceService.exists(namespace)) {
         return Response.status(Response.Status.NOT_FOUND).entity("Namespace not found").build();
       }
-      final Optional<Job> returnedJob = jobService.getJob(namespace, job);
+      final Optional<JobResponse> returnedJob = jobService.getJob(namespace, job);
       if (returnedJob.isPresent()) {
         return Response.ok().entity(coreJobToApiJobMapper.map(returnedJob.get())).build();
       }
@@ -128,7 +128,7 @@ public Response listJobs(@PathParam("namespace") final String namespace)
       if (!namespaceService.exists(namespace)) {
         return Response.status(Response.Status.NOT_FOUND).build();
       }
-      final List<Job> jobList = jobService.getAllJobsInNamespace(namespace);
+      final List<JobResponse> jobList = jobService.getAllJobsInNamespace(namespace);
       final JobsResponse response = new JobsResponse(coreJobToApiJobMapper.map(jobList));
       return Response.ok().entity(response).build();
     } catch (MarquezServiceException e) {

src/main/java/marquez/db/JobDao.java

@@ -17,7 +17,7 @@
 import java.util.List;
 import java.util.UUID;
 import marquez.db.mappers.JobRowMapper;
-import marquez.service.models.Job;
+import marquez.service.models.JobResponse;
 import marquez.service.models.JobVersion;
 import org.jdbi.v3.sqlobject.CreateSqlObject;
 import org.jdbi.v3.sqlobject.config.RegisterRowMapper;
@@ -34,37 +34,37 @@ public interface JobDao {
   @SqlUpdate(
       "INSERT INTO jobs (guid, name, namespace_guid, description, input_dataset_urns, output_dataset_urns) "
           + " VALUES (:guid, :name, :namespaceGuid, :description, :inputDatasetUrns, :outputDatasetUrns)")
-  public void insert(@BindBean Job job);
+  public void insert(@BindBean JobResponse job);
 
   @SqlUpdate("UPDATE jobs SET current_version_guid = :currentVersionGuid WHERE guid = :jobGuid")
   public void setCurrentVersionGuid(UUID jobGuid, UUID currentVersionGuid);
 
   @Transaction
-  default void insertJobAndVersion(final Job job, final JobVersion jobVersion) {
+  default void insertJobAndVersion(final JobResponse job, final JobVersion jobVersion) {
     insert(job);
     createJobVersionDao().insert(jobVersion);
     setCurrentVersionGuid(job.getGuid(), jobVersion.getGuid());
   }
 
   @SqlQuery(
       "SELECT j.*, jv.uri FROM jobs j INNER JOIN job_versions jv ON (j.guid = :guid AND j.current_version_guid = jv.guid)")
-  Job findByID(UUID guid);
+  JobResponse findByID(@Bind("guid") UUID guid);
 
   @SqlQuery(
       "SELECT j.*, jv.uri "
           + "FROM jobs j "
           + "INNER JOIN job_versions jv "
           + "    ON (j.current_version_guid = jv.guid) "
           + "INNER JOIN namespaces n "
-          + "    ON (j.namespace_guid = n.guid AND n.name = :namespace AND j.name = :name)")
-  Job findByName(String namespace, String name);
+          + "    ON (j.namespace_guid = n.guid AND n.name = :ns_name AND j.name = :job_name)")
+  JobResponse findByName(@Bind("ns_name") String namespace, @Bind("job_name") String name);
 
   @SqlQuery(
       "SELECT j.*, jv.uri "
           + "FROM jobs j "
           + "INNER JOIN job_versions jv "
           + " ON (j.current_version_guid = jv.guid) "
           + "INNER JOIN namespaces n "
-          + " ON (j.namespace_guid = n.guid AND n.name = :namespaceName)")
-  List<Job> findAllInNamespace(String namespaceName);
+          + " ON (j.namespace_guid = n.guid AND n.name = :ns_name)")
+  List<JobResponse> findAllInNamespace(@Bind("ns_name") String namespaceName);
 }

src/main/java/marquez/db/mappers/JobRowMapper.java

@@ -19,15 +19,15 @@
 import java.util.UUID;
 import lombok.NonNull;
 import marquez.db.Columns;
-import marquez.service.models.Job;
+import marquez.service.models.JobResponse;
 import org.jdbi.v3.core.mapper.RowMapper;
 import org.jdbi.v3.core.statement.StatementContext;
 
-public final class JobRowMapper implements RowMapper<Job> {
+public final class JobRowMapper implements RowMapper<JobResponse> {
   @Override
-  public Job map(@NonNull ResultSet results, @NonNull StatementContext context)
+  public JobResponse map(@NonNull ResultSet results, @NonNull StatementContext context)
       throws SQLException {
-    return new Job(
+    return new JobResponse(
         results.getObject(Columns.ROW_UUID, UUID.class),
         results.getString(Columns.NAME),
         results.getString(Columns.LOCATION),

src/main/java/marquez/service/JobService.java

@@ -27,7 +27,7 @@
 import marquez.db.JobRunDao;
 import marquez.db.JobVersionDao;
 import marquez.service.exceptions.MarquezServiceException;
-import marquez.service.models.Job;
+import marquez.service.models.JobResponse;
 import marquez.service.models.JobRun;
 import marquez.service.models.JobRunState;
 import marquez.service.models.JobVersion;
@@ -52,7 +52,7 @@ public JobService(
     this.jobRunArgsDao = jobRunArgsDao;
   }
 
-  public Optional<Job> getJob(String namespace, String jobName) throws MarquezServiceException {
+  public Optional<JobResponse> getJob(String namespace, String jobName) throws MarquezServiceException {
     try {
       return Optional.ofNullable(jobDao.findByName(namespace, jobName));
     } catch (UnableToExecuteStatementException e) {
@@ -62,12 +62,12 @@ public Optional<Job> getJob(String namespace, String jobName) throws MarquezServ
     }
   }
 
-  public Job createJob(String namespace, Job job) throws MarquezServiceException {
+  public JobResponse createJob(String namespace, JobResponse job) throws MarquezServiceException {
     try {
-      Job existingJob = this.jobDao.findByName(namespace, job.getName());
+      JobResponse existingJob = this.jobDao.findByName(namespace, job.getName());
       if (existingJob == null) {
-        Job newJob =
-            new Job(
+        JobResponse newJob =
+            new JobResponse(
                 UUID.randomUUID(),
                 job.getName(),
                 job.getLocation(),
@@ -78,8 +78,8 @@ public Job createJob(String namespace, Job job) throws MarquezServiceException {
         jobDao.insertJobAndVersion(newJob, JobService.createJobVersion(newJob));
         return jobDao.findByID(newJob.getGuid());
       } else {
-        Job existingJobWithNewUri =
-            new Job(
+        JobResponse existingJobWithNewUri =
+            new JobResponse(
                 existingJob.getGuid(),
                 existingJob.getName(),
                 job.getLocation(),
@@ -102,7 +102,7 @@ public Job createJob(String namespace, Job job) throws MarquezServiceException {
     }
   }
 
-  public List<Job> getAllJobsInNamespace(String namespace) throws MarquezServiceException {
+  public List<JobResponse> getAllJobsInNamespace(String namespace) throws MarquezServiceException {
     try {
       return jobDao.findAllInNamespace(namespace);
     } catch (UnableToExecuteStatementException e) {
@@ -208,7 +208,7 @@ public JobRun createJobRun(
     }
   }
 
-  private static JobVersion createJobVersion(Job job) {
+  private static JobVersion createJobVersion(JobResponse job) {
     return new JobVersion(
         UUID.randomUUID(),
         job.getGuid(),
@@ -219,7 +219,7 @@ private static JobVersion createJobVersion(Job job) {
         null);
   }
 
-  protected static UUID computeVersion(Job job) {
+  protected static UUID computeVersion(JobResponse job) {
     return UUID.nameUUIDFromBytes(
         String.format("%s:%s", job.getGuid(), job.getLocation()).getBytes());
   }

src/main/java/marquez/service/models/Job.java → src/main/java/marquez/service/models/JobResponse.java

@@ -25,7 +25,7 @@
 
 @AllArgsConstructor
 @EqualsAndHashCode
-public final class Job {
+public final class JobResponse {
   @NonNull @Getter private final UUID guid;
   @NonNull @Getter private final String name;
   @NonNull @Getter private final String location;
@@ -35,7 +35,7 @@ public final class Job {
   @Getter private final List<String> outputDatasetUrns;
   @Getter private final Timestamp createdAt;
 
-  public Job(
+  public JobResponse(
       final UUID guid,
       final String name,
       final String location,

src/test/java/marquez/api/JobIntegrationTest.java

@@ -30,7 +30,7 @@
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-import marquez.api.models.Job;
+import marquez.api.models.JobResponse;
 import marquez.api.models.JobRequest;
 import marquez.api.models.JobRunRequest;
 import marquez.api.models.JobRunResponse;
@@ -80,15 +80,15 @@ public static void setup() throws MarquezServiceException {
     NAMESPACE_NAME = generatedNamespace.getName();
     CREATED_NAMESPACE_UUID = generatedNamespace.getGuid();
 
-    marquez.service.models.Job job = Generator.genJob(generatedNamespace.getGuid());
-    marquez.service.models.Job createdJob = jobService.createJob(NAMESPACE_NAME, job);
+    marquez.service.models.JobResponse job = Generator.genJob(generatedNamespace.getGuid());
+    marquez.service.models.JobResponse createdJob = jobService.createJob(NAMESPACE_NAME, job);
 
     CREATED_JOB_NAME = createdJob.getName();
   }
 
   @Test
   public void testJobCreationResponseEndToEnd() {
-    Job jobForJobCreationRequest = generateApiJob();
+    JobResponse jobForJobCreationRequest = generateApiJob();
 
     Response res = createJobOnNamespace(NAMESPACE_NAME, jobForJobCreationRequest);
     assertEquals(Response.Status.CREATED.getStatusCode(), res.getStatus());
@@ -97,7 +97,7 @@ public void testJobCreationResponseEndToEnd() {
 
   @Test
   public void testJobGetterResponseEndToEnd() {
-    Job jobForJobCreationRequest = generateApiJob();
+    JobResponse jobForJobCreationRequest = generateApiJob();
 
     Response res = createJobOnNamespace(NAMESPACE_NAME, jobForJobCreationRequest);
     assertEquals(Response.Status.CREATED.getStatusCode(), res.getStatus());
@@ -242,8 +242,8 @@ public void testJobRunAfterMarkedAbortedEndToEnd() {
     assertThat(getJobRunResponse.getRunState()).isEqualTo(JobRunState.State.ABORTED.name());
   }
 
-  private void evaluateResponse(Response res, Job inputJob) {
-    Job responseJob = res.readEntity(Job.class);
+  private void evaluateResponse(Response res, JobResponse inputJob) {
+    JobResponse responseJob = res.readEntity(JobResponse.class);
     assertEquals(inputJob.getName(), responseJob.getName());
     assertEquals(inputJob.getDescription(), responseJob.getDescription());
     assertEquals(inputJob.getLocation(), responseJob.getLocation());
@@ -254,7 +254,7 @@ private void evaluateResponse(Response res, Job inputJob) {
     assertNotNull(responseJob.getCreatedAt());
   }
 
-  private Response createJobOnNamespace(String namespace, Job job) {
+  private Response createJobOnNamespace(String namespace, JobResponse job) {
     JobRequest jobRequest =
         new JobRequest(
             job.getInputDatasetUrns(),
@@ -270,13 +270,13 @@ private Response createJobOnNamespace(String namespace, Job job) {
         .put(Entity.json(jobRequest));
   }
 
-  static Job generateApiJob() {
+  static JobResponse generateApiJob() {
     String jobName = "myJob" + System.currentTimeMillis();
     final String location = "someLocation";
     final String description = "someDescription";
     final List<String> inputList = Collections.singletonList("input1");
     final List<String> outputList = Collections.singletonList("output1");
-    return new Job(jobName, null, inputList, outputList, location, description);
+    return new JobResponse(jobName, null, inputList, outputList, location, description);
   }
 
   private JobRunResponse getJobRunApiResponse(UUID jobRunGuid) {