Fix some generic warnings.

--
MOS_MIGRATED_REVID=112952552

2 files changed, 4 insertions, 5 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
index 166879d62c..528ed0bbb4 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
@@ -471,17 +471,16 @@ public class BuildView {
                   skylarkFunctionName));
         }
       } else {
-        @SuppressWarnings("unchecked")
         final Class<? extends ConfiguredNativeAspectFactory> aspectFactoryClass =
-            (Class<? extends ConfiguredNativeAspectFactory>)
-                ruleClassProvider.getAspectFactoryMap().get(aspect);
+            ruleClassProvider.getAspectFactoryMap().get(aspect)
+                .asSubclass(ConfiguredNativeAspectFactory.class);
         if (aspectFactoryClass != null) {
           for (ConfiguredTargetKey targetSpec : targetSpecs) {
             aspectKeys.add(
                 AspectValue.createAspectKey(
                     targetSpec.getLabel(),
                     targetSpec.getConfiguration(),
-                    new NativeAspectClass(aspectFactoryClass)));
+                    new NativeAspectClass<ConfiguredNativeAspectFactory>(aspectFactoryClass)));
           }
         } else {
           throw new ViewCreationFailedException("Aspect '" + aspect + "' is unknown");
diff --git a/src/main/java/com/google/devtools/build/lib/packages/NativeAspectClass.java b/src/main/java/com/google/devtools/build/lib/packages/NativeAspectClass.java
index 59bc6af3e1..62783dc111 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/NativeAspectClass.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/NativeAspectClass.java
@@ -56,7 +56,7 @@ public final class NativeAspectClass<T extends NativeAspectClass.NativeAspectFac
     if (!(obj instanceof NativeAspectClass)) {
       return false;
     }
-    return nativeClass.equals(((NativeAspectClass) obj).nativeClass);
+    return nativeClass.equals(((NativeAspectClass<?>) obj).nativeClass);
   }
 
   /**