Refactor image configuration classes

- Move archiveSizeBytes to ImageConfiguration
- Add Type enum to ImageConfiguration and type field
- Rename RawImageConfiguration to ComputeImageConfiguration
- Update tests
- Add getClass() equality check to ImageConfiguration.baseEquals

gcloud-java-compute/src/main/java/com/google/gcloud/compute/DeprecationStatus.java

@@ -344,7 +344,7 @@ public static <T extends ResourceId> DeprecationStatus<T> of(Status status, T re
   static <T extends ResourceId> DeprecationStatus<T> fromPb(
       com.google.api.services.compute.model.DeprecationStatus deprecationStatusPb,
       Function<String, T> fromUrl) {
-    Builder<T> builder = new Builder<T>();
+    Builder<T> builder = new Builder<>();
     builder.deleted(deprecationStatusPb.getDeleted());
     builder.deprecated(deprecationStatusPb.getDeprecated());
     builder.obsolete(deprecationStatusPb.getObsolete());

gcloud-java-compute/src/main/java/com/google/gcloud/compute/DiskImageConfiguration.java

@@ -43,16 +43,18 @@ public static final class Builder
     private DiskId sourceDisk;
     private String sourceDiskId;
 
-    private Builder() {}
+    private Builder() {
+      super(Type.DISK);
+    }
 
     private Builder(DiskImageConfiguration imageConfiguration) {
-      super(imageConfiguration);
+      super(Type.DISK, imageConfiguration);
       this.sourceDisk = imageConfiguration.sourceDisk;
       this.sourceDiskId = imageConfiguration.sourceDiskId;
     }
 
     private Builder(Image imagePb) {
-      super(imagePb);
+      super(Type.DISK, imagePb);
       this.sourceDisk = DiskId.fromUrl(imagePb.getSourceDisk());
       this.sourceDiskId = imagePb.getSourceDiskId();
     }
@@ -124,8 +126,10 @@ public final boolean equals(Object obj) {
 
   @Override
   DiskImageConfiguration setProjectId(String projectId) {
-    Builder builder = toBuilder().sourceDisk(sourceDisk.setProjectId(projectId));
-    return builder.build();
+    if (sourceDisk.project() != null) {
+      return this;
+    }
+    return toBuilder().sourceDisk(sourceDisk.setProjectId(projectId)).build();
   }
 
   @Override

gcloud-java-compute/src/main/java/com/google/gcloud/compute/ImageConfiguration.java

@@ -24,14 +24,31 @@
 
 /**
  * Base class for Google Compute Engine image configuration. Use {@link DiskImageConfiguration} to
- * create an image from an existing Google Compute Engine disk. Use {@link RawImageConfiguration} to
- * create an image from a file stored in Google Cloud Storage.
+ * create an image from an existing Google Compute Engine disk. Use
+ * {@link StorageImageConfiguration} to create an image from a file stored in Google Cloud Storage.
  */
 public abstract class ImageConfiguration implements Serializable {
 
   private static final long serialVersionUID = -9154332316597745316L;
 
+  private final Type type;
   private final SourceType sourceType;
+  private final Long archiveSizeBytes;
+
+  /**
+   * Type of a Google Compute Engine image.
+   */
+  public enum Type {
+    /**
+     * A Google Compute Engine image created from a Google Compute Engine disk.
+     */
+    DISK,
+
+    /**
+     * A Google Compute Engine image created from a file saved in Google Cloud Storage.
+     */
+    STORAGE
+  }
 
   /**
    * Image source type. The only admissible value is {@code RAW}.
@@ -48,38 +65,67 @@ public enum SourceType {
    */
   public abstract static class Builder<T extends ImageConfiguration, B extends Builder<T, B>> {
 
+    private Type type;
     private SourceType sourceType;
+    private Long archiveSizeBytes;
 
-    Builder() {}
+    Builder(Type type) {
+      this.type = type;
+    }
 
-    Builder(ImageConfiguration imageConfiguration) {
+    Builder(Type type, ImageConfiguration imageConfiguration) {
+      this.type = type;
       this.sourceType = imageConfiguration.sourceType;
+      this.archiveSizeBytes = imageConfiguration.archiveSizeBytes;
     }
 
-    Builder(Image imagePb) {
+    Builder(Type type, Image imagePb) {
+      this.type = type;
       if (imagePb.getSourceType() != null) {
         this.sourceType = SourceType.valueOf(imagePb.getSourceType());
       }
+      this.archiveSizeBytes = imagePb.getArchiveSizeBytes();
     }
 
     @SuppressWarnings("unchecked")
     B self() {
       return (B) this;
     }
 
+    B type(Type type) {
+      this.type = type;
+      return self();
+    }
+
     B sourceType(SourceType sourceType) {
       this.sourceType = sourceType;
       return self();
     }
 
+    B archiveSizeBytes(Long archiveSizeBytes) {
+      this.archiveSizeBytes = archiveSizeBytes;
+      return self();
+    }
+
     /**
      * Creates a configuration object.
      */
     public abstract T build();
   }
 
   ImageConfiguration(Builder builder) {
+    this.type = builder.type;
     this.sourceType = builder.sourceType;
+    this.archiveSizeBytes = builder.archiveSizeBytes;
+  }
+
+  /**
+   * Returns the image's type. This method returns {@link Type#DISK} if this image was created from
+   * an existing disk. This method returns {@link Type#STORAGE} if this image was created from a
+   * file in Google Cloud Storage.
+   */
+  public Type type() {
+    return type;
   }
 
   /**
@@ -89,13 +135,23 @@ public SourceType sourceType() {
     return sourceType;
   }
 
+  /**
+   * Returns the size of the image archive stored in Google Cloud Storage (in bytes).
+   */
+  public Long archiveSizeBytes() {
+    return archiveSizeBytes;
+  }
+
   /**
    * Returns a builder for the object.
    */
   public abstract Builder toBuilder();
 
   MoreObjects.ToStringHelper toStringHelper() {
-    return MoreObjects.toStringHelper(this).add("sourceType", sourceType);
+    return MoreObjects.toStringHelper(this)
+        .add("type", type)
+        .add("sourceType", sourceType)
+        .add("archiveSizeBytes", archiveSizeBytes);
   }
 
   @Override
@@ -104,11 +160,13 @@ public String toString() {
   }
 
   final int baseHashCode() {
-    return Objects.hash(sourceType);
+    return Objects.hash(type, sourceType, archiveSizeBytes);
   }
 
   final boolean baseEquals(ImageConfiguration imageConfiguration) {
-    return Objects.equals(toPb(), imageConfiguration.toPb());
+    return imageConfiguration != null
+        && getClass().equals(imageConfiguration.getClass())
+        && Objects.equals(toPb(), imageConfiguration.toPb());
   }
 
   abstract ImageConfiguration setProjectId(String projectId);
@@ -118,6 +176,7 @@ Image toPb() {
     if (sourceType != null) {
       imagePb.setSourceType(sourceType.name());
     }
+    imagePb.setArchiveSizeBytes(archiveSizeBytes);
     return imagePb;
   }
 
@@ -126,6 +185,6 @@ static <T extends ImageConfiguration> T fromPb(Image imagePb) {
     if (imagePb.getSourceDisk() != null) {
       return (T) DiskImageConfiguration.fromPb(imagePb);
     }
-    return (T) RawImageConfiguration.fromPb(imagePb);
+    return (T) StorageImageConfiguration.fromPb(imagePb);
   }
 }

gcloud-java-compute/src/main/java/com/google/gcloud/compute/ImageInfo.java

@@ -38,7 +38,7 @@
  * images of certain operating systems that you can use, or you can create a custom image. A custom
  * image is an image created from one of your virtual machine instances that contains your specific
  * instance configurations. Use {@link DiskImageConfiguration} to create an image from an existing
- * disk. Use {@link RawImageConfiguration} to create an image from a raw image stored in Google
+ * disk. Use {@link StorageImageConfiguration} to create an image from a raw image stored in Google
  * Cloud Storage.
  *
  * @see <a href="https://cloud.google.com/compute/docs/images">Images</a>
@@ -115,8 +115,8 @@ public abstract static class Builder {
 
     /**
      * Sets the image configuration. Use {@link DiskImageConfiguration} to create an image from an
-     * existing disk. Use {@link RawImageConfiguration} to create an image from a raw image stored
-     * in Google Cloud Storage.
+     * existing disk. Use {@link StorageImageConfiguration} to create an image from a raw image
+     * stored in Google Cloud Storage.
      */
     public abstract  Builder configuration(ImageConfiguration configuration);
 
@@ -286,8 +286,8 @@ public String description() {
   /**
    * Returns the image configuration. This method returns an instance of
    * {@link DiskImageConfiguration} if the the image was created from a Google Compute Engine disk.
-   * This method returns an instance of {@link RawImageConfiguration} if the image was created from
-   * a raw image stored in Google Cloud Storage.
+   * This method returns an instance of {@link StorageImageConfiguration} if the image was created
+   * from a raw image stored in Google Cloud Storage.
    */
   @SuppressWarnings("unchecked")
   public <T extends ImageConfiguration> T configuration() {
@@ -393,7 +393,7 @@ Image toPb() {
   /**
    * Returns a builder for an {@code ImageInfo} object given the image identity and an image
    * configuration. Use {@link DiskImageConfiguration} to create an image from an existing disk. Use
-   * {@link RawImageConfiguration} to create an image from a raw image stored in Google Cloud
+   * {@link StorageImageConfiguration} to create an image from a raw image stored in Google Cloud
    * Storage.
    */
   public static Builder builder(ImageId imageId, ImageConfiguration configuration) {
@@ -403,7 +403,7 @@ public static Builder builder(ImageId imageId, ImageConfiguration configuration)
   /**
    * Returns an {@code ImageInfo} object given the image identity and an image configuration. Use
    * {@link DiskImageConfiguration} to create an image from an existing disk. Use
-   * {@link RawImageConfiguration} to create an image from a raw image stored in Google Cloud
+   * {@link StorageImageConfiguration} to create an image from a raw image stored in Google Cloud
    * Storage.
    */
   public static ImageInfo of(ImageId imageId, ImageConfiguration configuration) {