Make native declared providers type-safe.

RELNOTES: None.
PiperOrigin-RevId: 161395570

3 files changed, 5 insertions, 10 deletions

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));
   }
 }