Make native declared providers type-safe.

RELNOTES: None.
PiperOrigin-RevId: 161395570

12 files changed, 28 insertions, 59 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/packages/RequiredProvidersTest.java b/src/test/java/com/google/devtools/build/lib/packages/RequiredProvidersTest.java
index abc3ec917d..03cc956b71 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/RequiredProvidersTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/RequiredProvidersTest.java
@@ -36,7 +36,7 @@ public class RequiredProvidersTest {
   private static final class P3 {}
 
   private static final ClassObjectConstructor P_NATIVE =
-      new NativeClassObjectConstructor("p_native") {};
+      new NativeClassObjectConstructor<SkylarkClassObject>(SkylarkClassObject.class, "p_native") {};
 
   private static final SkylarkClassObjectConstructor P_SKYLARK =
       new SkylarkClassObjectConstructor("p_skylark", Location.BUILTIN);
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDeviceScriptFixtureTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDeviceScriptFixtureTest.java
index 6149580254..3f51d80979 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDeviceScriptFixtureTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDeviceScriptFixtureTest.java
@@ -60,9 +60,7 @@ public class AndroidDeviceScriptFixtureTest extends AndroidBuildViewTestCase {
     ConfiguredTarget fixture = getConfiguredTarget("//javatests/com/app:fixture");
     assertThat(fixture).isNotNull();
     AndroidDeviceScriptFixtureInfoProvider deviceScriptFixtureInfoProvider =
-        (AndroidDeviceScriptFixtureInfoProvider)
-            fixture.get(
-                AndroidDeviceScriptFixtureInfoProvider.ANDROID_DEVICE_SCRIPT_FIXTURE_INFO.getKey());
+        fixture.get(AndroidDeviceScriptFixtureInfoProvider.ANDROID_DEVICE_SCRIPT_FIXTURE_INFO);
     assertThat(deviceScriptFixtureInfoProvider).isNotNull();
     assertThat(deviceScriptFixtureInfoProvider.getFixtureScript()).isNotNull();
     assertThat(deviceScriptFixtureInfoProvider.getFixtureScript().prettyPrint())
@@ -80,9 +78,7 @@ public class AndroidDeviceScriptFixtureTest extends AndroidBuildViewTestCase {
     ConfiguredTarget fixture = getConfiguredTarget("//javatests/com/app:fixture");
     assertThat(fixture).isNotNull();
     AndroidDeviceScriptFixtureInfoProvider deviceScriptFixtureInfoProvider =
-        (AndroidDeviceScriptFixtureInfoProvider)
-            fixture.get(
-                AndroidDeviceScriptFixtureInfoProvider.ANDROID_DEVICE_SCRIPT_FIXTURE_INFO.getKey());
+        fixture.get(AndroidDeviceScriptFixtureInfoProvider.ANDROID_DEVICE_SCRIPT_FIXTURE_INFO);
     assertThat(deviceScriptFixtureInfoProvider).isNotNull();
     assertThat(deviceScriptFixtureInfoProvider.getFixtureScript()).isNotNull();
     assertThat(deviceScriptFixtureInfoProvider.getFixtureScript().prettyPrint())
@@ -133,9 +129,7 @@ public class AndroidDeviceScriptFixtureTest extends AndroidBuildViewTestCase {
     ConfiguredTarget fixture = getConfiguredTarget("//javatests/com/app:fixture");
     assertThat(fixture).isNotNull();
     AndroidDeviceScriptFixtureInfoProvider deviceScriptFixtureInfoProvider =
-        (AndroidDeviceScriptFixtureInfoProvider)
-            fixture.get(
-                AndroidDeviceScriptFixtureInfoProvider.ANDROID_DEVICE_SCRIPT_FIXTURE_INFO.getKey());
+        fixture.get(AndroidDeviceScriptFixtureInfoProvider.ANDROID_DEVICE_SCRIPT_FIXTURE_INFO);
     assertThat(deviceScriptFixtureInfoProvider).isNotNull();
 
     assertThat(
@@ -169,9 +163,7 @@ public class AndroidDeviceScriptFixtureTest extends AndroidBuildViewTestCase {
     ConfiguredTarget fixture = getConfiguredTarget("//javatests/com/app:fixture");
     assertThat(fixture).isNotNull();
     AndroidDeviceScriptFixtureInfoProvider deviceScriptFixtureInfoProvider =
-        (AndroidDeviceScriptFixtureInfoProvider)
-            fixture.get(
-                AndroidDeviceScriptFixtureInfoProvider.ANDROID_DEVICE_SCRIPT_FIXTURE_INFO.getKey());
+        fixture.get(AndroidDeviceScriptFixtureInfoProvider.ANDROID_DEVICE_SCRIPT_FIXTURE_INFO);
     assertThat(deviceScriptFixtureInfoProvider).isNotNull();
     assertThat(deviceScriptFixtureInfoProvider.getDaemon()).isTrue();
   }
@@ -188,9 +180,7 @@ public class AndroidDeviceScriptFixtureTest extends AndroidBuildViewTestCase {
     ConfiguredTarget fixture = getConfiguredTarget("//javatests/com/app:fixture");
     assertThat(fixture).isNotNull();
     AndroidDeviceScriptFixtureInfoProvider deviceScriptFixtureInfoProvider =
-        (AndroidDeviceScriptFixtureInfoProvider)
-            fixture.get(
-                AndroidDeviceScriptFixtureInfoProvider.ANDROID_DEVICE_SCRIPT_FIXTURE_INFO.getKey());
+        fixture.get(AndroidDeviceScriptFixtureInfoProvider.ANDROID_DEVICE_SCRIPT_FIXTURE_INFO);
     assertThat(deviceScriptFixtureInfoProvider).isNotNull();
     assertThat(deviceScriptFixtureInfoProvider.getStrictExit()).isTrue();
   }
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDeviceTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDeviceTest.java
index a594abe3ee..ffd847c52e 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDeviceTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDeviceTest.java
@@ -169,7 +169,7 @@ public class AndroidDeviceTest extends BuildViewTestCase {
 
     assertThat(target.get(ExecutionInfoProvider.SKYLARK_CONSTRUCTOR.getKey())).isNotNull();
     ExecutionInfoProvider executionInfoProvider =
-        (ExecutionInfoProvider) target.get(ExecutionInfoProvider.SKYLARK_CONSTRUCTOR.getKey());
+        target.get(ExecutionInfoProvider.SKYLARK_CONSTRUCTOR);
     assertThat(executionInfoProvider.getExecutionInfo()).doesNotContainKey(REQUIRES_KVM);
     TemplateExpansionAction stubAction = (TemplateExpansionAction) getGeneratingAction(
         getExecutable(target));
@@ -228,9 +228,7 @@ public class AndroidDeviceTest extends BuildViewTestCase {
     assertThat(action.getExecutionInfo())
         .containsEntry(REQUIRES_KVM, "");
     assertThat(target.get(ExecutionInfoProvider.SKYLARK_CONSTRUCTOR.getKey())).isNotNull();
-    assertThat(
-            ((ExecutionInfoProvider) target.get(ExecutionInfoProvider.SKYLARK_CONSTRUCTOR.getKey()))
-                .getExecutionInfo())
+    assertThat(target.get(ExecutionInfoProvider.SKYLARK_CONSTRUCTOR).getExecutionInfo())
         .containsKey(REQUIRES_KVM);
   }
 
@@ -276,12 +274,7 @@ public class AndroidDeviceTest extends BuildViewTestCase {
     Iterable<String> biosFilesExecPathStrings =
         Iterables.transform(
             getToolDependency("//tools/android/emulator:emulator_x86_bios").getFilesToRun(),
-            new Function<Artifact, String>() {
-              @Override
-              public String apply(Artifact artifact) {
-                return artifact.getExecPathString();
-              }
-            });
+            Artifact::getExecPathString);
 
     assertWithMessage("Invalid boot commandline.")
         .that(action.getArguments())
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixtureTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixtureTest.java
index e0954c0c51..55718d40ee 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixtureTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixtureTest.java
@@ -162,7 +162,6 @@ public class AndroidHostServiceFixtureTest extends AndroidBuildViewTestCase {
 
   private AndroidHostServiceFixtureInfoProvider getHostServiceFixtureInfoProvider(
       ConfiguredTarget ct) throws Exception {
-    return (AndroidHostServiceFixtureInfoProvider)
-        ct.get(AndroidHostServiceFixtureInfoProvider.ANDROID_HOST_SERVICE_FIXTURE_INFO.getKey());
+    return ct.get(AndroidHostServiceFixtureInfoProvider.ANDROID_HOST_SERVICE_FIXTURE_INFO);
   }
 }
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationRuleImplTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationRuleImplTest.java
index e71be0a2bc..860082c483 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationRuleImplTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationRuleImplTest.java
@@ -72,9 +72,7 @@ public class AndroidInstrumentationRuleImplTest extends AndroidBuildViewTestCase
     ConfiguredTarget instrumentation = getConfiguredTarget("//javatests/com/app/instrumentation");
     assertThat(instrumentation).isNotNull();
     AndroidInstrumentationInfoProvider instrumentationProvider =
-        (AndroidInstrumentationInfoProvider)
-            instrumentation.get(
-                AndroidInstrumentationInfoProvider.ANDROID_INSTRUMENTATION_INFO.getKey());
+        instrumentation.get(AndroidInstrumentationInfoProvider.ANDROID_INSTRUMENTATION_INFO);
     assertThat(instrumentationProvider.getTargetApk()).isNotNull();
     assertThat(instrumentationProvider.getTargetApk().prettyPrint())
         .isEqualTo("javatests/com/app/instrumentation/instrumentation-target.apk");
@@ -98,9 +96,7 @@ public class AndroidInstrumentationRuleImplTest extends AndroidBuildViewTestCase
     ConfiguredTarget instrumentation = getConfiguredTarget("//javatests/com/app/instrumentation");
     assertThat(instrumentation).isNotNull();
     AndroidInstrumentationInfoProvider instrumentationProvider =
-        (AndroidInstrumentationInfoProvider)
-            instrumentation.get(
-                AndroidInstrumentationInfoProvider.ANDROID_INSTRUMENTATION_INFO.getKey());
+        instrumentation.get(AndroidInstrumentationInfoProvider.ANDROID_INSTRUMENTATION_INFO);
 
     Artifact targetApk = instrumentationProvider.getTargetApk();
     assertThat(targetApk).isNotNull();
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTestTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTestTest.java
index 66f08f83c2..a80a221b87 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTestTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTestTest.java
@@ -239,16 +239,14 @@ public class AndroidInstrumentationTestTest extends AndroidBuildViewTestCase {
   }
 
   private static Artifact getInstrumentationApk(ConfiguredTarget instrumentation) {
-    return ((AndroidInstrumentationInfoProvider)
-            instrumentation.get(
-                AndroidInstrumentationInfoProvider.ANDROID_INSTRUMENTATION_INFO.getKey()))
+    return instrumentation
+        .get(AndroidInstrumentationInfoProvider.ANDROID_INSTRUMENTATION_INFO)
         .getInstrumentationApk();
   }
 
   private static Artifact getTargetApk(ConfiguredTarget instrumentation) {
-    return ((AndroidInstrumentationInfoProvider)
-            instrumentation.get(
-                AndroidInstrumentationInfoProvider.ANDROID_INSTRUMENTATION_INFO.getKey()))
+    return instrumentation
+        .get(AndroidInstrumentationInfoProvider.ANDROID_INSTRUMENTATION_INFO)
         .getTargetApk();
   }
 }
diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java
index c42ef25391..be78678e13 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java
@@ -586,8 +586,7 @@ public class SkylarkJavaLiteProtoLibraryTest extends BuildViewTestCase {
 
   private static <P extends TransitiveInfoProvider> P getProvider(
       Class<P> providerClass, ConfiguredTarget target) {
-    JavaProvider javaProvider =
-        (JavaProvider) target.get(JavaProvider.JAVA_PROVIDER.getKey());
+    JavaProvider javaProvider = target.get(JavaProvider.JAVA_PROVIDER);
     return javaProvider.getProvider(providerClass);
   }
 }
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java
index db30b9a0ac..d387743cc5 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java
@@ -1360,8 +1360,7 @@ public class AppleBinaryTest extends ObjcRuleTestCase {
         ")");
     ConfiguredTarget binTarget = getConfiguredTarget("//bin:bin");
     AppleExecutableBinaryProvider executableBinaryProvider =
-        (AppleExecutableBinaryProvider) binTarget.get(
-            AppleExecutableBinaryProvider.SKYLARK_CONSTRUCTOR.getKey());
+        binTarget.get(AppleExecutableBinaryProvider.SKYLARK_CONSTRUCTOR);
     assertThat(executableBinaryProvider).isNotNull();
 
     CommandAction testLinkAction = linkAction("//test:test");
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java
index c410ce51cd..01f8b08d99 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java
@@ -532,8 +532,7 @@ public class AppleStaticLibraryTest extends ObjcRuleTestCase {
         ")");
     ConfiguredTarget binTarget = getConfiguredTarget("//lib:applelib");
     AppleStaticLibraryProvider provider =
-        (AppleStaticLibraryProvider) binTarget.get(
-            AppleStaticLibraryProvider.SKYLARK_CONSTRUCTOR.getKey());
+        binTarget.get(AppleStaticLibraryProvider.SKYLARK_CONSTRUCTOR);
     assertThat(provider).isNotNull();
     assertThat(provider.getMultiArchArchive()).isNotNull();
     assertThat(provider.getDepsObjcProvider()).isNotNull();
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/IosDeviceTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/IosDeviceTest.java
index 49b7540b69..273f51b497 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/IosDeviceTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/IosDeviceTest.java
@@ -104,8 +104,7 @@ public class IosDeviceTest extends BuildViewTestCase {
     assertThat(view.hasErrors(getConfiguredTarget("//test:foo"))).isFalse();
 
     ConfiguredTarget target = getConfiguredTarget("//test:foo");
-    IosDeviceProvider provider =
-        (IosDeviceProvider) target.get(IosDeviceProvider.SKYLARK_CONSTRUCTOR.getKey());
+    IosDeviceProvider provider = target.get(IosDeviceProvider.SKYLARK_CONSTRUCTOR);
     assertThat(provider.getType()).isEqualTo("IPHONE_6");
   }
 
@@ -156,8 +155,7 @@ public class IosDeviceTest extends BuildViewTestCase {
     assertThat(view.hasErrors(getConfiguredTarget(label))).isFalse();
 
     ConfiguredTarget target = getConfiguredTarget(label);
-    IosDeviceProvider provider =
-        (IosDeviceProvider) target.get(IosDeviceProvider.SKYLARK_CONSTRUCTOR.getKey());
+    IosDeviceProvider provider = target.get(IosDeviceProvider.SKYLARK_CONSTRUCTOR);
     assertThat(provider.getXcodeVersion()).isEqualTo(DottedVersion.fromString(version));
   }
 
@@ -165,8 +163,7 @@ public class IosDeviceTest extends BuildViewTestCase {
     assertThat(view.hasErrors(getConfiguredTarget(label))).isFalse();
 
     ConfiguredTarget target = getConfiguredTarget(label);
-    IosDeviceProvider provider =
-        (IosDeviceProvider) target.get(IosDeviceProvider.SKYLARK_CONSTRUCTOR.getKey());
+    IosDeviceProvider provider = target.get(IosDeviceProvider.SKYLARK_CONSTRUCTOR);
     assertThat(provider.getIosVersion()).isEqualTo(DottedVersion.fromString(version));
   }
 }
diff --git a/src/test/java/com/google/devtools/build/lib/rules/test/SkylarkTestingModuleTest.java b/src/test/java/com/google/devtools/build/lib/rules/test/SkylarkTestingModuleTest.java
index 7aecef07b4..0d6318f606 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/test/SkylarkTestingModuleTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/test/SkylarkTestingModuleTest.java
@@ -45,9 +45,7 @@ public class SkylarkTestingModuleTest extends BuildViewTestCase {
         ")");
 
     ConfiguredTarget skylarkTarget = getConfiguredTarget("//examples/apple_skylark:my_target");
-    ExecutionInfoProvider provider =
-        (ExecutionInfoProvider)
-            skylarkTarget.get(ExecutionInfoProvider.SKYLARK_CONSTRUCTOR.getKey());
+    ExecutionInfoProvider provider = skylarkTarget.get(ExecutionInfoProvider.SKYLARK_CONSTRUCTOR);
 
     assertThat(provider.getExecutionInfo().get("requires-darwin")).isEqualTo("1");
   }
@@ -73,8 +71,7 @@ public class SkylarkTestingModuleTest extends BuildViewTestCase {
 
     ConfiguredTarget skylarkTarget = getConfiguredTarget("//examples/apple_skylark:my_target");
     TestEnvironmentProvider provider =
-        (TestEnvironmentProvider)
-            skylarkTarget.get(TestEnvironmentProvider.SKYLARK_CONSTRUCTOR.getKey());
+        skylarkTarget.get(TestEnvironmentProvider.SKYLARK_CONSTRUCTOR);
 
     assertThat(provider.getEnvironment().get("XCODE_VERSION_OVERRIDE")).isEqualTo("7.3.1");
   }
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
index 24c16e59c8..1cd8a98c62 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
@@ -1404,8 +1404,10 @@ public class SkylarkEvaluationTest extends EvaluationTest {
 
   @SkylarkModule(name = "SkylarkClassObjectWithSkylarkCallables", doc = "")
   static final class SkylarkClassObjectWithSkylarkCallables extends SkylarkClassObject {
-    private static final NativeClassObjectConstructor CONSTRUCTOR =
-        new NativeClassObjectConstructor("struct_with_skylark_callables") {};
+    private static final NativeClassObjectConstructor<SkylarkClassObjectWithSkylarkCallables>
+        CONSTRUCTOR =
+            new NativeClassObjectConstructor<SkylarkClassObjectWithSkylarkCallables>(
+                SkylarkClassObjectWithSkylarkCallables.class, "struct_with_skylark_callables") {};
 
     SkylarkClassObjectWithSkylarkCallables() {
       super(