Fixed Issue #358 02: rename class job

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

@@ -14,11 +14,11 @@
 
 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.Job> {
   @Override
-  public marquez.service.models.Job map(Job value) {
+  public marquez.service.models.Job map(JobResponse value) {
     return new marquez.service.models.Job(
         null,
         value.getName(),

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.Job, JobResponse> {
   @Override
-  public Job map(marquez.service.models.Job value) {
-    return new Job(
+  public JobResponse map(marquez.service.models.Job 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<JobResponse> jobs;
 }

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

@@ -78,7 +78,7 @@ public Response create(
       }
       final Job jobToCreate =
           apiJobToCoreJobMapper.map(
-              new marquez.api.models.Job(
+              new marquez.api.models.JobResponse(
                   job,
                   null,
                   request.getInputDatasetUrns(),

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

@@ -30,8 +30,8 @@
 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.JobRequest;
+import marquez.api.models.JobResponse;
 import marquez.api.models.JobRunRequest;
 import marquez.api.models.JobRunResponse;
 import marquez.db.JobDao;
@@ -88,7 +88,7 @@ public static void setup() throws MarquezServiceException {
 
   @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) {

src/test/java/marquez/api/JobResourceTest.java

@@ -35,8 +35,8 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import marquez.api.exceptions.ResourceExceptionMapper;
-import marquez.api.models.Job;
 import marquez.api.models.JobRequest;
+import marquez.api.models.JobResponse;
 import marquez.api.models.JobRunRequest;
 import marquez.api.models.JobRunResponse;
 import marquez.api.models.JobsResponse;
@@ -76,7 +76,7 @@ public void clearMocks() {
 
   @Test
   public void testJobCreationWithInvalidNamespace() throws MarquezServiceException {
-    Job jobForJobCreationRequest = generateApiJob();
+    JobResponse jobForJobCreationRequest = generateApiJob();
 
     when(MOCK_NAMESPACE_SERVICE.get(any())).thenReturn(Optional.empty());
     when(MOCK_NAMESPACE_SERVICE.exists(any())).thenReturn(false);
@@ -90,14 +90,14 @@ public void testCreateJobInternalErrorHandling() throws MarquezServiceException
     when(MOCK_NAMESPACE_SERVICE.exists(any())).thenReturn(true);
     when(MOCK_NAMESPACE_SERVICE.get(any())).thenReturn(Optional.of(Generator.genNamespace()));
 
-    Job jobForJobCreationRequest = generateApiJob();
+    JobResponse jobForJobCreationRequest = generateApiJob();
     Response res = insertJob(jobForJobCreationRequest);
     assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), res.getStatus());
   }
 
   @Test
   public void testGetJobWithInvalidNamespace() throws MarquezServiceException {
-    Job jobForJobCreationRequest = generateApiJob();
+    JobResponse jobForJobCreationRequest = generateApiJob();
 
     when(MOCK_NAMESPACE_SERVICE.get(any())).thenReturn(Optional.empty());
     when(MOCK_NAMESPACE_SERVICE.exists(any())).thenReturn(false);
@@ -121,7 +121,7 @@ public void testCreateJobBadInputs() throws MarquezServiceException {
     when(MOCK_NAMESPACE_SERVICE.exists(any())).thenReturn(true);
     when(MOCK_NAMESPACE_SERVICE.get(any())).thenReturn(Optional.of(Generator.genNamespace()));
 
-    Job jobForJobCreationRequest = generateApiJob();
+    JobResponse jobForJobCreationRequest = generateApiJob();
     jobForJobCreationRequest.setLocation(null);
 
     Response res = insertJob(jobForJobCreationRequest);
@@ -133,7 +133,7 @@ public void testDescriptionOptionalForCreateJobInputs() throws MarquezServiceExc
     when(MOCK_NAMESPACE_SERVICE.exists(any())).thenReturn(true);
     when(MOCK_NAMESPACE_SERVICE.get(any())).thenReturn(Optional.of(Generator.genNamespace()));
 
-    Job jobForJobCreationRequest = generateApiJob();
+    JobResponse jobForJobCreationRequest = generateApiJob();
     jobForJobCreationRequest.setDescription(null);
 
     insertJob(jobForJobCreationRequest);
@@ -193,7 +193,7 @@ public void testGetAllJobsInNamespace() throws MarquezServiceException {
     String path = format("/api/v1/namespaces/%s/jobs/", NAMESPACE_NAME);
     Response res = resources.client().target(path).request(MediaType.APPLICATION_JSON).get();
     assertEquals(Response.Status.OK.getStatusCode(), res.getStatus());
-    List<Job> returnedJobs = res.readEntity(JobsResponse.class).getJobs();
+    List<JobResponse> returnedJobs = res.readEntity(JobsResponse.class).getJobs();
     assertThat(returnedJobs).hasSize(jobsList.size());
   }
 
@@ -332,7 +332,7 @@ private Response getJob(String jobName) {
     return resources.client().target(path).request(MediaType.APPLICATION_JSON).get();
   }
 
-  private Response insertJob(Job job) {
+  private Response insertJob(JobResponse job) {
     JobRequest jobRequest =
         new JobRequest(
             job.getInputDatasetUrns(),
@@ -396,13 +396,13 @@ private Response markJobRunWithState(String jobRunId, String newState) {
     return resources.client().target(path).request(MediaType.APPLICATION_JSON).put(EMPTY_PUT_BODY);
   }
 
-  Job generateApiJob() {
+  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);
   }
 
   JobRunResponse generateApiJobRun() {

src/test/java/marquez/api/JobTest.java

@@ -21,7 +21,7 @@
 import java.time.Instant;
 import java.util.Collections;
 import java.util.List;
-import marquez.api.models.Job;
+import marquez.api.models.JobResponse;
 import org.assertj.core.api.AssertionsForClassTypes;
 import org.junit.Test;
 
@@ -34,29 +34,32 @@ public class JobTest {
   private static final List<String> OUTPUT_DATA_SETS = Collections.EMPTY_LIST;
   private static final String LOCATION = "git://some/path/123";
 
-  private static final Job JOB =
-      new Job(JOB_NAME, CREATED_AT, INPUT_DATA_SETS, OUTPUT_DATA_SETS, LOCATION, DESCRIPTION);
+  private static final JobResponse JOB =
+      new JobResponse(
+          JOB_NAME, CREATED_AT, INPUT_DATA_SETS, OUTPUT_DATA_SETS, LOCATION, DESCRIPTION);
 
   @Test
   public void testJobEquality() {
-    Job j2 =
-        new Job(JOB_NAME, CREATED_AT, INPUT_DATA_SETS, OUTPUT_DATA_SETS, LOCATION, DESCRIPTION);
+    JobResponse j2 =
+        new JobResponse(
+            JOB_NAME, CREATED_AT, INPUT_DATA_SETS, OUTPUT_DATA_SETS, LOCATION, DESCRIPTION);
     AssertionsForClassTypes.assertThat(JOB.equals(JOB));
     AssertionsForClassTypes.assertThat(JOB.equals(j2));
     AssertionsForClassTypes.assertThat(j2.equals(JOB));
   }
 
   @Test
   public void testHashCodeEquality() {
-    Job j2 =
-        new Job(JOB_NAME, CREATED_AT, INPUT_DATA_SETS, OUTPUT_DATA_SETS, LOCATION, DESCRIPTION);
+    JobResponse j2 =
+        new JobResponse(
+            JOB_NAME, CREATED_AT, INPUT_DATA_SETS, OUTPUT_DATA_SETS, LOCATION, DESCRIPTION);
     assertEquals(JOB.hashCode(), j2.hashCode());
   }
 
   @Test
   public void testJobInequalityOnNonIdField() {
-    Job j2 =
-        new Job(
+    JobResponse j2 =
+        new JobResponse(
             JOB_NAME,
             CREATED_AT,
             INPUT_DATA_SETS,
@@ -69,8 +72,8 @@ public void testJobInequalityOnNonIdField() {
 
   @Test
   public void testJobHashcodeInequalityOnNonIdField() {
-    Job j2 =
-        new Job(
+    JobResponse j2 =
+        new JobResponse(
             JOB_NAME,
             CREATED_AT,
             INPUT_DATA_SETS,