Suppress unchecked warning for defaultServiceFactory, defaultRpcFactory and toBuilder (#881)

mziccard · aozarov · commit af18b50d924b · 2016-04-08T15:36:02.000-07:00
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryOptions.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryOptions.java
@@ -85,6 +85,7 @@ protected Set<String> scopes() {
     return SCOPES;
   }
 
+  @SuppressWarnings("unchecked")
   @Override
   public Builder toBuilder() {
     return new Builder(this);
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
@@ -646,9 +646,9 @@ private static <T> T newInstance(String className) throws IOException, ClassNotF
     }
   }
 
-  protected abstract <T extends ServiceFactory<ServiceT, OptionsT>> T defaultServiceFactory();
+  protected abstract ServiceFactory<ServiceT, OptionsT> defaultServiceFactory();
 
-  protected abstract <T extends ServiceRpcFactory<ServiceRpcT, OptionsT>> T defaultRpcFactory();
+  protected abstract ServiceRpcFactory<ServiceRpcT, OptionsT> defaultRpcFactory();
 
   protected abstract Set<String> scopes();
 
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java
@@ -102,13 +102,11 @@ protected String defaultProject() {
     return projectId != null ? projectId : super.defaultProject();
   }
 
-  @SuppressWarnings("unchecked")
   @Override
   protected DatastoreFactory defaultServiceFactory() {
     return DefaultDatastoreFactory.INSTANCE;
   }
 
-  @SuppressWarnings("unchecked")
   @Override
   protected DatastoreRpcFactory defaultRpcFactory() {
     return DefaultDatastoreRpcFactory.INSTANCE;
diff --git a/gcloud-java-dns/src/main/java/com/google/gcloud/dns/DnsOptions.java b/gcloud-java-dns/src/main/java/com/google/gcloud/dns/DnsOptions.java
@@ -69,13 +69,11 @@ private DnsOptions(Builder builder) {
     super(DnsFactory.class, DnsRpcFactory.class, builder);
   }
 
-  @SuppressWarnings("unchecked")
   @Override
   protected DnsFactory defaultServiceFactory() {
     return DefaultDnsFactory.INSTANCE;
   }
 
-  @SuppressWarnings("unchecked")
   @Override
   protected DnsRpcFactory defaultRpcFactory() {
     return DefaultDnsRpcFactory.INSTANCE;
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerOptions.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerOptions.java
@@ -112,6 +112,7 @@ public int hashCode() {
     return baseHashCode();
   }
 
+  @SuppressWarnings("unchecked")
   @Override
   public Builder toBuilder() {
     return new Builder(this);
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageOptions.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageOptions.java
@@ -69,13 +69,11 @@ private StorageOptions(Builder builder) {
     super(StorageFactory.class, StorageRpcFactory.class, builder);
   }
 
-  @SuppressWarnings("unchecked")
   @Override
   protected StorageFactory defaultServiceFactory() {
     return DefaultStorageFactory.INSTANCE;
   }
 
-  @SuppressWarnings("unchecked")
   @Override
   protected StorageRpcFactory defaultRpcFactory() {
     return DefaultStorageRpcFactory.INSTANCE;

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,7 @@ protected Set<String> scopes() {`
`85`	`85`	`return SCOPES;`
`86`	`86`	`}`
`87`	`87`
	`88`	`+ @SuppressWarnings("unchecked")`
`88`	`89`	`@Override`
`89`	`90`	`public Builder toBuilder() {`
`90`	`91`	`return new Builder(this);`
Original file line number	Diff line number	Diff line change
`@@ -646,9 +646,9 @@ private static <T> T newInstance(String className) throws IOException, ClassNotF`
`646`	`646`	`}`
`647`	`647`	`}`
`648`	`648`
`649`		`- protected abstract <T extends ServiceFactory<ServiceT, OptionsT>> T defaultServiceFactory();`
	`649`	`+ protected abstract ServiceFactory<ServiceT, OptionsT> defaultServiceFactory();`
`650`	`650`
`651`		`- protected abstract <T extends ServiceRpcFactory<ServiceRpcT, OptionsT>> T defaultRpcFactory();`
	`651`	`+ protected abstract ServiceRpcFactory<ServiceRpcT, OptionsT> defaultRpcFactory();`
`652`	`652`
`653`	`653`	`protected abstract Set<String> scopes();`
`654`	`654`
Original file line number	Diff line number	Diff line change
`@@ -102,13 +102,11 @@ protected String defaultProject() {`
`102`	`102`	`return projectId != null ? projectId : super.defaultProject();`
`103`	`103`	`}`
`104`	`104`
`105`		`- @SuppressWarnings("unchecked")`
`106`	`105`	`@Override`
`107`	`106`	`protected DatastoreFactory defaultServiceFactory() {`
`108`	`107`	`return DefaultDatastoreFactory.INSTANCE;`
`109`	`108`	`}`
`110`	`109`
`111`		`- @SuppressWarnings("unchecked")`
`112`	`110`	`@Override`
`113`	`111`	`protected DatastoreRpcFactory defaultRpcFactory() {`
`114`	`112`	`return DefaultDatastoreRpcFactory.INSTANCE;`
Original file line number	Diff line number	Diff line change
`@@ -69,13 +69,11 @@ private DnsOptions(Builder builder) {`
`69`	`69`	`super(DnsFactory.class, DnsRpcFactory.class, builder);`
`70`	`70`	`}`
`71`	`71`
`72`		`- @SuppressWarnings("unchecked")`
`73`	`72`	`@Override`
`74`	`73`	`protected DnsFactory defaultServiceFactory() {`
`75`	`74`	`return DefaultDnsFactory.INSTANCE;`
`76`	`75`	`}`
`77`	`76`
`78`		`- @SuppressWarnings("unchecked")`
`79`	`77`	`@Override`
`80`	`78`	`protected DnsRpcFactory defaultRpcFactory() {`
`81`	`79`	`return DefaultDnsRpcFactory.INSTANCE;`
Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,7 @@ public int hashCode() {`
`112`	`112`	`return baseHashCode();`
`113`	`113`	`}`
`114`	`114`
	`115`	`+ @SuppressWarnings("unchecked")`
`115`	`116`	`@Override`
`116`	`117`	`public Builder toBuilder() {`
`117`	`118`	`return new Builder(this);`
Original file line number	Diff line number	Diff line change
`@@ -69,13 +69,11 @@ private StorageOptions(Builder builder) {`
`69`	`69`	`super(StorageFactory.class, StorageRpcFactory.class, builder);`
`70`	`70`	`}`
`71`	`71`
`72`		`- @SuppressWarnings("unchecked")`
`73`	`72`	`@Override`
`74`	`73`	`protected StorageFactory defaultServiceFactory() {`
`75`	`74`	`return DefaultStorageFactory.INSTANCE;`
`76`	`75`	`}`
`77`	`76`
`78`		`- @SuppressWarnings("unchecked")`
`79`	`77`	`@Override`
`80`	`78`	`protected StorageRpcFactory defaultRpcFactory() {`
`81`	`79`	`return DefaultStorageRpcFactory.INSTANCE;`