Add test for missing fields, fix NPE, minor docs and lint fixes

mziccard · mziccard · commit 785c3fe3a43c · 2016-04-29T09:51:22.000+02:00
diff --git a/gcloud-java-compute/README.md b/gcloud-java-compute/README.md
@@ -10,7 +10,8 @@ Java idiomatic client for [Google Cloud Compute] (https://cloud.google.com/compu
 [![Dependency Status](https://www.versioneye.com/user/projects/56bd8ee72a29ed002d2b0969/badge.svg?style=flat)](https://www.versioneye.com/user/projects/56bd8ee72a29ed002d2b0969)
 
 -  [Homepage] (https://googlecloudplatform.github.io/gcloud-java/)
-<!-- TODO(mziccard): add link to API documentatin -->
+
+<!-- TODO(mziccard): add link to API documentation -->
 
 > Note: This client is a work-in-progress, and may occasionally
 > make backwards-incompatible changes.
diff --git a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/DiskTypeId.java b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/DiskTypeId.java
@@ -99,14 +99,14 @@ public static DiskTypeId of(ZoneId zoneId, String diskType) {
   }
 
   /**
-   * Returns a disk type identity given the zone disk and disk type.
+   * Returns a disk type identity given the zone and disk type names.
    */
   public static DiskTypeId of(String zone, String diskType) {
     return of(ZoneId.of(null, zone), diskType);
   }
 
   /**
-   * Returns a disk type identity given project disk, zone disk and disk type.
+   * Returns a disk type identity given project disk, zone and disk type names.
    */
   public static DiskTypeId of(String project, String zone, String diskType) {
     return of(ZoneId.of(project, zone), diskType);
diff --git a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/MachineType.java b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/MachineType.java
@@ -164,7 +164,7 @@ public MachineTypeId machineTypeId() {
   }
 
   /**
-   * Returns an unique identifier for the machin type; defined by the service.
+   * Returns an unique identifier for the machine type; defined by the service.
    */
   public BigInteger id() {
     return id;
diff --git a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Region.java b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Region.java
@@ -327,7 +327,9 @@ com.google.api.services.compute.model.Region toPb() {
     regionPb.setName(regionId.region());
     regionPb.setDescription(description);
     regionPb.setSelfLink(selfLink);
-    regionPb.setStatus(status.name());
+    if (status != null) {
+      regionPb.setStatus(status.name());
+    }
     if (zones != null) {
       regionPb.setZones(Lists.transform(zones, ZoneId.TO_URL_FUNCTION));
     }
diff --git a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Zone.java b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Zone.java
@@ -356,7 +356,9 @@ com.google.api.services.compute.model.Zone toPb() {
     zonePb.setName(zoneId.zone());
     zonePb.setDescription(description);
     zonePb.setSelfLink(selfLink);
-    zonePb.setStatus(status.name());
+    if (status != null) {
+      zonePb.setStatus(status.name());
+    }
     if (maintenanceWindows != null) {
       zonePb.setMaintenanceWindows(
           Lists.transform(maintenanceWindows, MaintenanceWindow.TO_PB_FUNCTION));
diff --git a/gcloud-java-compute/src/test/java/com/google/gcloud/compute/DiskTypeTest.java b/gcloud-java-compute/src/test/java/com/google/gcloud/compute/DiskTypeTest.java
@@ -63,7 +63,6 @@ public void testBuilder() {
   public void testToPbAndFromPb() {
     compareDiskTypes(DISK_TYPE, DiskType.fromPb(DISK_TYPE.toPb()));
     DiskType diskType = DiskType.builder()
-        .id(ID)
         .diskTypeId(DISK_TYPE_ID)
         .selfLink(DISK_TYPE_ID.toUrl())
         .build();
diff --git a/gcloud-java-compute/src/test/java/com/google/gcloud/compute/MachineTypeTest.java b/gcloud-java-compute/src/test/java/com/google/gcloud/compute/MachineTypeTest.java
@@ -75,7 +75,6 @@ public void testBuilder() {
   public void testToPbAndFromPb() {
     compareMachineTypes(MACHINE_TYPE, MachineType.fromPb(MACHINE_TYPE.toPb()));
     MachineType machineType = MachineType.builder()
-        .id(ID)
         .machineTypeId(MACHINE_TYPE_ID)
         .selfLink(MACHINE_TYPE_ID.toUrl())
         .build();
diff --git a/gcloud-java-compute/src/test/java/com/google/gcloud/compute/RegionTest.java b/gcloud-java-compute/src/test/java/com/google/gcloud/compute/RegionTest.java
@@ -76,6 +76,8 @@ public void testToAndFromPb() {
     compareRegions(REGION, region);
     assertEquals(REGION_ID.project(), region.regionId().project());
     assertEquals(REGION_ID.region(), region.regionId().region());
+    region = Region.builder().regionId(REGION_ID).selfLink(REGION_ID.toUrl()).build();
+    compareRegions(region, Region.fromPb(region.toPb()));
   }
 
   private void compareRegions(Region expected, Region value) {
diff --git a/gcloud-java-compute/src/test/java/com/google/gcloud/compute/ZoneTest.java b/gcloud-java-compute/src/test/java/com/google/gcloud/compute/ZoneTest.java
@@ -77,6 +77,8 @@ public void testToAndFromPb() {
     compareZones(ZONE, zone);
     assertEquals(ZONE_ID.project(), zone.zoneId().project());
     assertEquals(ZONE_ID.zone(), zone.zoneId().zone());
+    zone = Zone.builder().zoneId(ZONE_ID).selfLink(ZONE_ID.toUrl()).build();
+    compareZones(zone, Zone.fromPb(zone.toPb()));
   }
 
   private void compareZones(Zone expected, Zone value) {

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ public MachineTypeId machineTypeId() {`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`/**`
`167`		`- * Returns an unique identifier for the machin type; defined by the service.`
	`167`	`+ * Returns an unique identifier for the machine type; defined by the service.`
`168`	`168`	`*/`
`169`	`169`	`public BigInteger id() {`
`170`	`170`	`return id;`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,8 @@ public void testToAndFromPb() {`
`76`	`76`	`compareRegions(REGION, region);`
`77`	`77`	`assertEquals(REGION_ID.project(), region.regionId().project());`
`78`	`78`	`assertEquals(REGION_ID.region(), region.regionId().region());`
	`79`	`+ region = Region.builder().regionId(REGION_ID).selfLink(REGION_ID.toUrl()).build();`
	`80`	`+ compareRegions(region, Region.fromPb(region.toPb()));`
`79`	`81`	`}`
`80`	`82`
`81`	`83`	`private void compareRegions(Region expected, Region value) {`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,8 @@ public void testToAndFromPb() {`
`77`	`77`	`compareZones(ZONE, zone);`
`78`	`78`	`assertEquals(ZONE_ID.project(), zone.zoneId().project());`
`79`	`79`	`assertEquals(ZONE_ID.zone(), zone.zoneId().zone());`
	`80`	`+ zone = Zone.builder().zoneId(ZONE_ID).selfLink(ZONE_ID.toUrl()).build();`
	`81`	`+ compareZones(zone, Zone.fromPb(zone.toPb()));`
`80`	`82`	`}`
`81`	`83`
`82`	`84`	`private void compareZones(Zone expected, Zone value) {`