Minor fixes

Author: Ajay Kannan

README.md

@@ -258,7 +258,7 @@ import java.nio.channels.WritableByteChannel;
 
 Storage storage = StorageOptions.defaultInstance().service();
 BlobId blobId = BlobId.of("bucket", "blob_name");
-Blob blob = storage.get(storage, blobId);
+Blob blob = storage.get(blobId);
 if (blob == null) {
   BlobInfo blobInfo = BlobInfo.builder(blobId).contentType("text/plain").build();
   storage.create(blobInfo, "Hello, Cloud Storage!".getBytes(UTF_8));

gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java

@@ -38,6 +38,9 @@ public class Project extends ProjectInfo {
   private final ResourceManagerOptions options;
   private transient ResourceManager resourceManager;
 
+  /**
+   * Builder for {@code Project}.
+   */
   public static class Builder extends ProjectInfo.Builder {
     private final ResourceManager resourceManager;
     private final ProjectInfo.BuilderImpl infoBuilder;
@@ -127,7 +130,7 @@ public ResourceManager resourceManager() {
   }
 
   /**
-   * Fetches the current project's latest information. Returns {@code null} if the job does not
+   * Fetches the project's latest information. Returns {@code null} if the project does not
    * exist.
    *
    * @return Project containing the project's updated metadata or {@code null} if not found

gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ProjectInfo.java

@@ -115,6 +115,9 @@ static ResourceId fromPb(
     }
   }
 
+  /**
+   * Builder for {@code ProjectInfo}.
+   */
   public abstract static class Builder {
 
     /**
@@ -184,7 +187,9 @@ static class BuilderImpl extends Builder {
     private Long createTimeMillis;
     private ResourceId parent;
 
-    BuilderImpl() {}
+    BuilderImpl(String projectId) {
+      this.projectId = projectId;
+    }
 
     BuilderImpl(ProjectInfo info) {
       this.name = info.name;
@@ -331,7 +336,7 @@ public Long createTimeMillis() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj.getClass().equals(ProjectInfo.class)
+    return obj != null && obj.getClass().equals(ProjectInfo.class)
         && Objects.equals(toPb(), ((ProjectInfo) obj).toPb());
   }
 
@@ -341,7 +346,7 @@ public int hashCode() {
   }
 
   public static Builder builder(String id) {
-    return new BuilderImpl().projectId(id);
+    return new BuilderImpl(id);
   }
 
   public Builder toBuilder() {

gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java

@@ -87,9 +87,9 @@ public void testBuilder() {
     initializeExpectedProject(4);
     expect(resourceManager.options()).andReturn(mockOptions).times(4);
     replay(resourceManager);
-    Project.Builder builder = new Project.Builder(new Project(resourceManager, new ProjectInfo.BuilderImpl()));
+    Project.Builder builder =
+        new Project.Builder(new Project(resourceManager, new ProjectInfo.BuilderImpl(PROJECT_ID)));
     Project project = builder.name(NAME)
-        .projectId(PROJECT_ID)
         .labels(LABELS)
         .projectNumber(PROJECT_NUMBER)
         .createTimeMillis(CREATE_TIME_MILLIS)

gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java

@@ -157,6 +157,9 @@ static Storage.BlobGetOption[] toGetOptions(BlobInfo blobInfo, BlobSourceOption.
     }
   }
 
+  /**
+   * Builder for {@code BlobInfo}.
+   */
   public static class Builder extends BlobInfo.Builder {
 
     private final Storage storage;

gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java

@@ -90,6 +90,9 @@ public Set<Entry<K, V>> entrySet() {
     }
   }
 
+  /**
+   * Builder for {@code BlobInfo}.
+   */
   public abstract static class Builder {
 
     /**
@@ -213,7 +216,9 @@ static final class BuilderImpl extends Builder {
     private Long deleteTime;
     private Long updateTime;
 
-    BuilderImpl() {}
+    BuilderImpl(BlobId blobId) {
+      this.blobId = blobId;
+    }
 
     BuilderImpl(BlobInfo blobInfo) {
       blobId = blobInfo.blobId;
@@ -609,7 +614,8 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj.getClass().equals(BlobInfo.class) && Objects.equals(toPb(), ((BlobInfo) obj).toPb());
+    return obj != null && obj.getClass().equals(BlobInfo.class)
+        && Objects.equals(toPb(), ((BlobInfo) obj).toPb());
   }
 
   StorageObject toPb() {
@@ -688,7 +694,7 @@ public static Builder builder(String bucket, String name, Long generation) {
   }
 
   public static Builder builder(BlobId blobId) {
-    return new BuilderImpl().blobId(blobId);
+    return new BuilderImpl(blobId);
   }
 
   static BlobInfo fromPb(StorageObject storageObject) {

gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java

@@ -48,6 +48,8 @@
  */
 public final class Bucket extends BucketInfo {
 
+  private static final long serialVersionUID = 8574601739542252586L;
+
   private final StorageOptions options;
   private transient Storage storage;
 
@@ -122,6 +124,9 @@ static Storage.BucketGetOption[] toGetOptions(BucketInfo bucketInfo,
     }
   }
 
+  /**
+   * Builder for {@code Bucket}.
+   */
   public static class Builder extends BucketInfo.Builder {
     private final Storage storage;
     private final BucketInfo.BuilderImpl infoBuilder;

gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java

@@ -317,6 +317,9 @@ void populateCondition(Rule.Condition condition) {
     }
   }
 
+  /**
+   * Builder for {@code BucketInfo}.
+   */
   public abstract static class Builder {
     /**
      * Sets the bucket's name.
@@ -425,7 +428,9 @@ static final class BuilderImpl extends Builder {
     private List<Acl> acl;
     private List<Acl> defaultAcl;
 
-    BuilderImpl() {}
+    BuilderImpl(String name) {
+      this.name = name;
+    }
 
     BuilderImpl(BucketInfo bucketInfo) {
       id = bucketInfo.id;
@@ -714,7 +719,7 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj.getClass().equals(BucketInfo.class)
+    return obj != null && obj.getClass().equals(BucketInfo.class)
         && Objects.equals(toPb(), ((BucketInfo) obj).toPb());
   }
 
@@ -799,11 +804,11 @@ public static BucketInfo of(String name) {
    * Returns a {@code BucketInfo} builder where the bucket's name is set to the provided name.
    */
   public static Builder builder(String name) {
-    return new BuilderImpl().name(name);
+    return new BuilderImpl(name);
   }
 
   static BucketInfo fromPb(com.google.api.services.storage.model.Bucket bucketPb) {
-    Builder builder = new BuilderImpl().name(bucketPb.getName());
+    Builder builder = new BuilderImpl(bucketPb.getName());
     if (bucketPb.getId() != null) {
       builder.id(bucketPb.getId());
     }

gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java

@@ -1208,7 +1208,7 @@ private static void checkContentType(BlobInfo blobInfo) throws IllegalArgumentEx
   /**
    * Create a new bucket.
    *
-   * @return a complete bucket information
+   * @return a complete bucket
    * @throws StorageException upon failure
    */
   Bucket create(BucketInfo bucketInfo, BucketTargetOption... options);
@@ -1479,7 +1479,7 @@ private static void checkContentType(BlobInfo blobInfo) throws IllegalArgumentEx
    * Gets the requested blobs. A batch request is used to perform this call.
    *
    * @param blobIds blobs to get
-   * @return an immutable list of {@code BlobInfo} objects. If a blob does not exist or access to it
+   * @return an immutable list of {@code Blob} objects. If a blob does not exist or access to it
    *     has been denied the corresponding item in the list is {@code null}.
    * @throws StorageException upon failure
    */
@@ -1493,7 +1493,7 @@ private static void checkContentType(BlobInfo blobInfo) throws IllegalArgumentEx
    * {@link #update(com.google.gcloud.storage.BlobInfo)} for a code example.
    *
    * @param blobInfos blobs to update
-   * @return an immutable list of {@code BlobInfo} objects. If a blob does not exist or access to it
+   * @return an immutable list of {@code Blob} objects. If a blob does not exist or access to it
    *     has been denied the corresponding item in the list is {@code null}.
    * @throws StorageException upon failure
    */

gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java

@@ -266,7 +266,7 @@ public Bucket apply(com.google.api.services.storage.model.Bucket bucketPb) {
                   return Bucket.fromPb(serviceOptions.service(), bucketPb);
                 }
               });
-      return new PageImpl<Bucket>(
+      return new PageImpl<>(
           new BucketPageFetcher(serviceOptions, cursor, optionsMap), cursor,
           buckets);
     } catch (RetryHelperException e) {

gcloud-java-storage/src/main/java/com/google/gcloud/storage/package-info.java

@@ -21,7 +21,7 @@
  * <pre> {@code
  * Storage storage = StorageOptions.defaultInstance().service();
  * BlobId blobId = BlobId.of("bucket", "blob_name");
- * Blob blob = storage.get(storage, blobId);
+ * Blob blob = storage.get(blobId);
  * if (blob == null) {
  *   BlobInfo blobInfo = BlobInfo.builder(blobId).contentType("text/plain").build();
  *   storage.create(blobInfo, "Hello, Cloud Storage!".getBytes(UTF_8));

pom.xml

@@ -253,7 +253,7 @@
       <plugin>
         <groupId>org.eluder.coveralls</groupId>
         <artifactId>coveralls-maven-plugin</artifactId>
-        <version>4.1.0</version>
+        <version>3.1.0</version>
         <configuration>
           <coberturaReports>
             <coberturaReport>${basedir}/target/coverage.xml</coberturaReport>