Add generic type to ServiceOption definition + minor fixes

Ajay Kannan · Ajay Kannan · commit d0eec713a4c8 · 2015-12-10T09:53:38.000-08:00
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java b/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java
@@ -71,10 +71,9 @@ public PageImpl(NextPageFetcher<T> pageFetcher, String cursor, Iterable<T> resul
     this.results = results;
   }
 
-  @SuppressWarnings("unchecked")
   @Override
   public Iterable<T> values() {
-    return results == null ? Collections.EMPTY_LIST : results;
+    return results == null ? Collections.<T>emptyList() : results;
   }
 
   @Override
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -53,12 +53,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-@SuppressWarnings("rawtypes")
-public abstract class ServiceOptions<
-    ServiceT extends Service,
-    ServiceRpcT,
-    OptionsT extends ServiceOptions<ServiceT, ServiceRpcT, OptionsT>>
-    implements Serializable {
+public abstract class ServiceOptions<ServiceT extends Service<OptionsT>, ServiceRpcT,
+    OptionsT extends ServiceOptions<ServiceT, ServiceRpcT, OptionsT>> implements Serializable {
 
   private static final String DEFAULT_HOST = "https://www.googleapis.com";
   private static final long serialVersionUID = 1203687993961393350L;
@@ -154,9 +150,7 @@ private Object readResolve() throws ObjectStreamException {
     }
   }
 
-  protected abstract static class Builder<
-      ServiceT extends Service,
-      ServiceRpcT,
+  protected abstract static class Builder<ServiceT extends Service<OptionsT>, ServiceRpcT,
       OptionsT extends ServiceOptions<ServiceT, ServiceRpcT, OptionsT>,
       B extends Builder<ServiceT, ServiceRpcT, OptionsT, B>> {
 
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/ValueTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/ValueTest.java
@@ -66,7 +66,7 @@ private class TestBuilder extends Value.BaseBuilder<Set, Value<Set>, TestBuilder
       super(ValueType.LIST);
     }
 
-    @SuppressWarnings({"unchecked", "rawtypes"})
+    @SuppressWarnings({"unchecked"})
     @Override
     public Value<Set> build() {
       return new Value(this) {
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobWriteChannelImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobWriteChannelImplTest.java
@@ -234,7 +234,8 @@ public void testStateEquals() {
         .times(2);
     replay(storageRpcMock);
     writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
-    @SuppressWarnings("resource") // avoid closing when you don't want partial writes to GCS
+    // avoid closing when you don't want partial writes to GCS upon failure
+    @SuppressWarnings("resource")
     BlobWriteChannel writer2 = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     RestorableState<BlobWriteChannel> state = writer.capture();
     RestorableState<BlobWriteChannel> state2 = writer2.capture();
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
@@ -74,8 +74,7 @@ public static void beforeClass() {
   }
 
   @AfterClass
-  public static void afterClass()
-throws ExecutionException, InterruptedException {
+  public static void afterClass() throws ExecutionException, InterruptedException {
     if (storage != null && !RemoteGcsHelper.forceDelete(storage, BUCKET, 5, TimeUnit.SECONDS)) {
       if (log.isLoggable(Level.WARNING)) {
         log.log(Level.WARNING, "Deletion of bucket {0} timed out, bucket is not empty", BUCKET);
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
@@ -128,7 +128,8 @@ public void testWriteChannelState() throws IOException, ClassNotFoundException {
         .projectId("p2")
         .retryParams(RetryParams.defaultInstance())
         .build();
-    @SuppressWarnings("resource") // avoid closing when you don't want partial writes to GCS
+    // avoid closing when you don't want partial writes to GCS upon failure
+    @SuppressWarnings("resource")
     BlobWriteChannelImpl writer = new BlobWriteChannelImpl(
         options, BlobInfo.builder(BlobId.of("b", "n")).build(), "upload-id");
     RestorableState<BlobWriteChannel> state = writer.capture();

Original file line number	Diff line number	Diff line change
`@@ -71,10 +71,9 @@ public PageImpl(NextPageFetcher<T> pageFetcher, String cursor, Iterable<T> resul`
`71`	`71`	`this.results = results;`
`72`	`72`	`}`
`73`	`73`
`74`		`- @SuppressWarnings("unchecked")`
`75`	`74`	`@Override`
`76`	`75`	`public Iterable<T> values() {`
`77`		`- return results == null ? Collections.EMPTY_LIST : results;`
	`76`	`+ return results == null ? Collections.<T>emptyList() : results;`
`78`	`77`	`}`
`79`	`78`
`80`	`79`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ private class TestBuilder extends Value.BaseBuilder<Set, Value<Set>, TestBuilder`
`66`	`66`	`super(ValueType.LIST);`
`67`	`67`	`}`
`68`	`68`
`69`		`- @SuppressWarnings({"unchecked", "rawtypes"})`
	`69`	`+ @SuppressWarnings({"unchecked"})`
`70`	`70`	`@Override`
`71`	`71`	`public Value<Set> build() {`
`72`	`72`	`return new Value(this) {`
Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,7 @@ public static void beforeClass() {`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`@AfterClass`
`77`		`- public static void afterClass()`
`78`		`-throws ExecutionException, InterruptedException {`
	`77`	`+ public static void afterClass() throws ExecutionException, InterruptedException {`
`79`	`78`	`if (storage != null && !RemoteGcsHelper.forceDelete(storage, BUCKET, 5, TimeUnit.SECONDS)) {`
`80`	`79`	`if (log.isLoggable(Level.WARNING)) {`
`81`	`80`	`log.log(Level.WARNING, "Deletion of bucket {0} timed out, bucket is not empty", BUCKET);`