add null check to JobInfo.fromPb(Job) and .toPb() (googleapis#3770)

sombra-mykola-bakay · pongad · commit d1970588545f · 2018-10-05T14:11:05.000-07:00
Fixes googleapis#3739.
diff --git a/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobInfo.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobInfo.java
@@ -180,7 +180,9 @@ static final class BuilderImpl extends Builder {
         this.statistics = JobStatistics.fromPb(jobPb);
       }
       this.userEmail = jobPb.getUserEmail();
-      this.configuration = JobConfiguration.fromPb(jobPb.getConfiguration());
+      if (jobPb.getConfiguration() != null) {
+        this.configuration = JobConfiguration.fromPb(jobPb.getConfiguration());
+      }
     }
 
     @Override
@@ -375,7 +377,9 @@ Job toPb() {
     if (statistics != null) {
       jobPb.setStatistics(statistics.toPb());
     }
-    jobPb.setConfiguration(configuration.toPb());
+    if(configuration != null){
+      jobPb.setConfiguration(configuration.toPb());
+    }
     return jobPb;
   }
 
diff --git a/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobTest.java
@@ -523,6 +523,16 @@ public void testToAndFromPb() {
     compareJob(expectedJob, Job.fromPb(serviceMockReturnsOptions, expectedJob.toPb()));
   }
 
+  @Test
+  public void testToAndFromPbWithoutConfiguration() {
+    JobInfo jobInfo =
+        JobInfo.newBuilder(null)
+            .build();
+    initializeExpectedJob(4, jobInfo);
+    replay(bigquery);
+    compareJob(expectedJob, Job.fromPb(serviceMockReturnsOptions, expectedJob.toPb()));
+  }
+
   private void compareJob(Job expected, Job value) {
     assertEquals(expected, value);
     compareJobInfo(expected, value);

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,9 @@ static final class BuilderImpl extends Builder {`
`180`	`180`	`this.statistics = JobStatistics.fromPb(jobPb);`
`181`	`181`	`}`
`182`	`182`	`this.userEmail = jobPb.getUserEmail();`
`183`		`- this.configuration = JobConfiguration.fromPb(jobPb.getConfiguration());`
	`183`	`+ if (jobPb.getConfiguration() != null) {`
	`184`	`+ this.configuration = JobConfiguration.fromPb(jobPb.getConfiguration());`
	`185`	`+ }`
`184`	`186`	`}`
`185`	`187`
`186`	`188`	`@Override`
`@@ -375,7 +377,9 @@ Job toPb() {`
`375`	`377`	`if (statistics != null) {`
`376`	`378`	`jobPb.setStatistics(statistics.toPb());`
`377`	`379`	`}`
`378`		`- jobPb.setConfiguration(configuration.toPb());`
	`380`	`+ if(configuration != null){`
	`381`	`+ jobPb.setConfiguration(configuration.toPb());`
	`382`	`+ }`
`379`	`383`	`return jobPb;`
`380`	`384`	`}`
`381`	`385`