From 4a55d41405be2e579d7e6550193a2ecdd27997ac Mon Sep 17 00:00:00 2001
From: cushon <cushon@google.com>
Date: Thu, 31 Jan 2019 16:47:17 -0800
Subject: [PATCH] Make JavaRuntimeInfo extend ToolchainInfo, and delete
 JavaRuntimeToolchainInfo

PiperOrigin-RevId: 231880172
---
 .../devtools/build/lib/rules/java/BUILD       |  2 +-
 .../rules/java/JavaHostRuntimeAliasRule.java  |  3 +-
 .../build/lib/rules/java/JavaRuleClasses.java |  4 +-
 .../build/lib/rules/java/JavaRuntime.java     |  1 -
 .../lib/rules/java/JavaRuntimeAliasRule.java  |  3 +-
 .../build/lib/rules/java/JavaRuntimeInfo.java | 18 +++-----
 .../rules/java/JavaRuntimeToolchainInfo.java  | 43 -------------------
 .../lib/rules/java/JavaSkylarkCommon.java     |  5 ++-
 .../rules/java/proto/JavaLiteProtoAspect.java |  4 +-
 .../java/JavaRuntimeInfoApi.java              |  8 ++--
 10 files changed, 22 insertions(+), 69 deletions(-)
 delete mode 100644 src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeToolchainInfo.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/BUILD b/src/main/java/com/google/devtools/build/lib/rules/java/BUILD
index b4b6d2bd6b3442..55b715c2bd4bfb 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/BUILD
@@ -57,6 +57,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib:skylarkinterface",
         "//src/main/java/com/google/devtools/build/lib:util",
         "//src/main/java/com/google/devtools/build/lib/actions",
+        "//src/main/java/com/google/devtools/build/lib/analysis/platform",
         "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
         "//src/main/java/com/google/devtools/build/lib/concurrent",
         "//src/main/java/com/google/devtools/build/lib/rules/cpp",
@@ -106,7 +107,6 @@ java_library(
         "JavaRuleOutputJarsProvider.java",
         "JavaRunfilesProvider.java",
         "JavaRuntimeInfo.java",
-        "JavaRuntimeToolchainInfo.java",
         "JavaSemantics.java",
         "JavaSkylarkApiProvider.java",
         "JavaSkylarkCommon.java",
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaHostRuntimeAliasRule.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaHostRuntimeAliasRule.java
index df2921454966af..033ea61d5cfb29 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaHostRuntimeAliasRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaHostRuntimeAliasRule.java
@@ -16,6 +16,7 @@
 
 import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment;
 import com.google.devtools.build.lib.analysis.config.HostTransition;
+import com.google.devtools.build.lib.analysis.platform.ToolchainInfo;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.packages.Attribute;
 import com.google.devtools.build.lib.rules.LateBoundAlias.CommonAliasRule;
@@ -29,6 +30,6 @@ public JavaHostRuntimeAliasRule() {
   @Override
   protected Attribute.Builder<Label> makeAttribute(RuleDefinitionEnvironment environment) {
     Attribute.Builder<Label> builder = super.makeAttribute(environment);
-    return builder.cfg(HostTransition.INSTANCE).mandatoryProviders(JavaRuntimeInfo.PROVIDER.id());
+    return builder.cfg(HostTransition.INSTANCE).mandatoryProviders(ToolchainInfo.PROVIDER.id());
   }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuleClasses.java
index 7df17882ece3f7..4735cb0532f710 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuleClasses.java
@@ -97,13 +97,13 @@ public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env)
           .add(
               attr(":jvm", LABEL)
                   .value(JavaSemantics.jvmAttribute(env))
-                  .mandatoryProviders(JavaRuntimeInfo.PROVIDER.id())
+                  .mandatoryProviders(ToolchainInfo.PROVIDER.id())
                   .useOutputLicenses())
           .add(
               attr(":host_jdk", LABEL)
                   .cfg(HostTransition.INSTANCE)
                   .value(JavaSemantics.hostJdkAttribute(env))
-                  .mandatoryProviders(JavaRuntimeInfo.PROVIDER.id()))
+                  .mandatoryProviders(ToolchainInfo.PROVIDER.id()))
           .add(
               attr(JAVA_RUNTIME_TOOLCHAIN_TYPE_ATTRIBUTE_NAME, NODEP_LABEL)
                   .value(JavaRuleClasses.javaRuntimeTypeAttribute(env)))
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntime.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntime.java
index ac67f0aa0f3541..e996dbdf1bfdf8 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntime.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntime.java
@@ -114,7 +114,6 @@ public ConfiguredTarget create(RuleContext ruleContext)
         .addProvider(RunfilesProvider.class, RunfilesProvider.simple(runfiles))
         .setFilesToBuild(filesToBuild)
         .addNativeDeclaredProvider(javaRuntime)
-        .addNativeDeclaredProvider(new JavaRuntimeToolchainInfo(javaRuntime))
         .addNativeDeclaredProvider(templateVariableInfo)
         .build();
   }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeAliasRule.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeAliasRule.java
index 4ffc25dec727e6..d80ec9a54577a9 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeAliasRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeAliasRule.java
@@ -15,6 +15,7 @@
 package com.google.devtools.build.lib.rules.java;
 
 import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment;
+import com.google.devtools.build.lib.analysis.platform.ToolchainInfo;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.packages.Attribute;
 import com.google.devtools.build.lib.rules.LateBoundAlias.CommonAliasRule;
@@ -28,6 +29,6 @@ public JavaRuntimeAliasRule() {
   @Override
   protected Attribute.Builder<Label> makeAttribute(RuleDefinitionEnvironment environment) {
     Attribute.Builder<Label> builder = super.makeAttribute(environment);
-    return builder.mandatoryProviders(JavaRuntimeInfo.PROVIDER.id());
+    return builder.mandatoryProviders(ToolchainInfo.PROVIDER.id());
   }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeInfo.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeInfo.java
index d66c97701579f7..a2c80681d2a138 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeInfo.java
@@ -17,6 +17,7 @@
 import static com.google.devtools.build.lib.packages.BuildType.NODEP_LABEL;
 import static com.google.devtools.build.lib.rules.java.JavaRuleClasses.JAVA_RUNTIME_TOOLCHAIN_TYPE_ATTRIBUTE_NAME;
 
+import com.google.common.collect.ImmutableMap;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.PlatformOptions;
 import com.google.devtools.build.lib.analysis.RuleContext;
@@ -27,9 +28,8 @@
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
+import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.packages.BuildType;
-import com.google.devtools.build.lib.packages.NativeInfo;
-import com.google.devtools.build.lib.packages.NativeProvider;
 import com.google.devtools.build.lib.packages.RuleErrorConsumer;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization;
@@ -40,11 +40,7 @@
 /** Information about the Java runtime used by the <code>java_*</code> rules. */
 @Immutable
 @AutoCodec
-public class JavaRuntimeInfo extends NativeInfo implements JavaRuntimeInfoApi {
-  public static final String SKYLARK_NAME = "JavaRuntimeInfo";
-
-  public static final NativeProvider<JavaRuntimeInfo> PROVIDER =
-      new NativeProvider<JavaRuntimeInfo>(JavaRuntimeInfo.class, SKYLARK_NAME) {};
+public class JavaRuntimeInfo extends ToolchainInfo implements JavaRuntimeInfoApi {
 
   public static JavaRuntimeInfo create(
       NestedSet<Artifact> javaBaseInputs,
@@ -95,8 +91,8 @@ private static JavaRuntimeInfo from(
     if (toolchainType != null && useToolchainResolutionForJavaRules) {
       ToolchainInfo toolchainInfo =
           ruleContext.getToolchainContext().forToolchainType(toolchainType);
-      if (toolchainInfo instanceof JavaRuntimeToolchainInfo) {
-        return ((JavaRuntimeToolchainInfo) toolchainInfo).javaRuntime();
+      if (toolchainInfo instanceof JavaRuntimeInfo) {
+        return (JavaRuntimeInfo) toolchainInfo;
       }
     }
 
@@ -116,7 +112,7 @@ private static JavaRuntimeInfo from(
   @Nullable
   protected static JavaRuntimeInfo from(
       TransitiveInfoCollection collection, RuleErrorConsumer errorConsumer) {
-    return collection.get(JavaRuntimeInfo.PROVIDER);
+    return (JavaRuntimeInfo) collection.get(ToolchainInfo.PROVIDER);
   }
 
   private final NestedSet<Artifact> javaBaseInputs;
@@ -135,7 +131,7 @@ protected static JavaRuntimeInfo from(
       PathFragment javaBinaryExecPath,
       PathFragment javaHomeRunfilesPath,
       PathFragment javaBinaryRunfilesPath) {
-    super(PROVIDER);
+    super(ImmutableMap.of(), Location.BUILTIN);
     this.javaBaseInputs = javaBaseInputs;
     this.javaBaseInputsMiddleman = javaBaseInputsMiddleman;
     this.javaHome = javaHome;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeToolchainInfo.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeToolchainInfo.java
deleted file mode 100644
index 77a7fd85077332..00000000000000
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeToolchainInfo.java
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2018 The Bazel Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.devtools.build.lib.rules.java;
-
-import static java.util.Objects.requireNonNull;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.devtools.build.lib.analysis.platform.ToolchainInfo;
-import com.google.devtools.build.lib.concurrent.ThreadSafety;
-import com.google.devtools.build.lib.events.Location;
-import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
-
-/**
- * A wrapper class for {@link JavaRuntimeInfo} that can be used to expose it to the toolchain
- * resolution system.
- */
-@ThreadSafety.Immutable
-@AutoCodec
-public final class JavaRuntimeToolchainInfo extends ToolchainInfo {
-  private final JavaRuntimeInfo javaRuntime;
-
-  @AutoCodec.Instantiator
-  public JavaRuntimeToolchainInfo(JavaRuntimeInfo javaRuntime) {
-    super(ImmutableMap.of(), Location.BUILTIN);
-    this.javaRuntime = requireNonNull(javaRuntime);
-  }
-
-  public JavaRuntimeInfo javaRuntime() {
-    return javaRuntime;
-  }
-}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSkylarkCommon.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSkylarkCommon.java
index d03b125cdec795..24b835e1e84b89 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSkylarkCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSkylarkCommon.java
@@ -19,6 +19,7 @@
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.PlatformOptions;
 import com.google.devtools.build.lib.analysis.RuleContext;
+import com.google.devtools.build.lib.analysis.platform.ToolchainInfo;
 import com.google.devtools.build.lib.analysis.skylark.SkylarkActionFactory;
 import com.google.devtools.build.lib.analysis.skylark.SkylarkRuleContext;
 import com.google.devtools.build.lib.cmdline.Label;
@@ -230,12 +231,12 @@ public JavaInfo makeNonStrict(JavaInfo javaInfo) {
 
   @Override
   public Provider getJavaToolchainProvider() {
-    return JavaToolchainProvider.PROVIDER;
+    return ToolchainInfo.PROVIDER;
   }
 
   @Override
   public Provider getJavaRuntimeProvider() {
-    return JavaRuntimeInfo.PROVIDER;
+    return ToolchainInfo.PROVIDER;
   }
 
   /**
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java
index 2625c6c7fc4efa..83dacae6254f20 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java
@@ -32,6 +32,7 @@
 import com.google.devtools.build.lib.analysis.TransitiveInfoProvider;
 import com.google.devtools.build.lib.analysis.config.HostTransition;
 import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget;
+import com.google.devtools.build.lib.analysis.platform.ToolchainInfo;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
@@ -45,7 +46,6 @@
 import com.google.devtools.build.lib.rules.java.JavaConfiguration;
 import com.google.devtools.build.lib.rules.java.JavaRuleClasses;
 import com.google.devtools.build.lib.rules.java.JavaRuleOutputJarsProvider;
-import com.google.devtools.build.lib.rules.java.JavaRuntimeInfo;
 import com.google.devtools.build.lib.rules.java.JavaSemantics;
 import com.google.devtools.build.lib.rules.java.JavaSkylarkApiProvider;
 import com.google.devtools.build.lib.rules.java.JavaSourceJarsProvider;
@@ -132,7 +132,7 @@ public AspectDefinition getDefinition(AspectParameters aspectParameters) {
                 attr(":host_jdk", LABEL)
                     .cfg(HostTransition.INSTANCE)
                     .value(hostJdkAttribute)
-                    .mandatoryProviders(JavaRuntimeInfo.PROVIDER.id()))
+                    .mandatoryProviders(ToolchainInfo.PROVIDER.id()))
             .add(
                 attr(JavaRuleClasses.JAVA_TOOLCHAIN_ATTRIBUTE_NAME, LABEL)
                     .useOutputLicenses()
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaRuntimeInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaRuntimeInfoApi.java
index 8db3fb11bee038..e9aa1c6101b0f1 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaRuntimeInfoApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaRuntimeInfoApi.java
@@ -14,16 +14,14 @@
 
 package com.google.devtools.build.lib.skylarkbuildapi.java;
 
-import com.google.devtools.build.lib.skylarkbuildapi.StructApi;
+import com.google.devtools.build.lib.skylarkbuildapi.platform.ToolchainInfoApi;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 import com.google.devtools.build.lib.vfs.PathFragment;
 
-/**
- * Information about the Java runtime being used.
- */
+/** Information about the Java runtime being used. */
 @SkylarkModule(name = "JavaRuntimeInfo", doc = "Information about the Java runtime being used.")
-public interface JavaRuntimeInfoApi extends StructApi {
+public interface JavaRuntimeInfoApi extends ToolchainInfoApi {
 
   @SkylarkCallable(
       name = "java_home",