Suppress unchecked warning for defaultServiceFactory, defaultRpcFacto…

…ry and toBuilder (#881)
googleapis · Apr 8, 2016 · af18b50 · af18b50
1 parent 1eb3522
commit af18b50
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 8 deletions.
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/...sourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerOptions.java b/...sourcemanager/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;