Cleanup maybeTransitiveOnlyRuntimeJarsToJavaInfo.

PiperOrigin-RevId: 362033568

src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java
index 1a30533..0ce7380 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java
@@ -474,7 +474,7 @@
         javaInfoBuilder
             .addProvider(JavaSourceJarsProvider.class, sourceJarsProvider)
             .addProvider(JavaRuleOutputJarsProvider.class, ruleOutputJarsProvider)
-            .maybeTransitiveOnlyRuntimeJarsToJavaInfo(common.getDependencies(), true)
+            .addTransitiveOnlyRuntimeJars(common.getDependencies())
             .build();
 
     Artifact validation =

src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java
index 983dfb6..6f5381b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java
@@ -135,7 +135,7 @@
             .addProvider(JavaCompilationArgsProvider.class, compilationArgsProvider)
             .addProvider(JavaRuleOutputJarsProvider.class, ruleOutputJarsProvider)
             .addProvider(JavaSourceJarsProvider.class, sourceJarsProvider)
-            .maybeTransitiveOnlyRuntimeJarsToJavaInfo(common.getDependencies(), true)
+            .addTransitiveOnlyRuntimeJars(common.getDependencies())
             .setRuntimeJars(javaArtifacts.getRuntimeJars())
             .setJavaConstraints(JavaCommon.getConstraints(ruleContext))
             .setNeverlink(neverLink)

src/main/java/com/google/devtools/build/lib/rules/java/JavaInfo.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfo.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfo.java
index 005aa12..d1517e5 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfo.java
@@ -494,19 +494,14 @@
       return this;
     }
 
-    public Builder maybeTransitiveOnlyRuntimeJarsToJavaInfo(
-        List<? extends TransitiveInfoCollection> deps, boolean shouldAdd) {
-      // TODO(b/149926109): Currently all callers call with shouldAdd=true as a temporary workaround
-      // to make --trim_test_configuration work again.
-      if (shouldAdd) {
-        deps.stream()
-            .map(JavaInfo::getJavaInfo)
-            .filter(Objects::nonNull)
-            .map(j -> j.getProvider(JavaCompilationArgsProvider.class))
-            .filter(Objects::nonNull)
-            .map(JavaCompilationArgsProvider::getRuntimeJars)
-            .forEach(this::addTransitiveOnlyRuntimeJars);
-      }
+    public Builder addTransitiveOnlyRuntimeJars(List<? extends TransitiveInfoCollection> deps) {
+      deps.stream()
+          .map(JavaInfo::getJavaInfo)
+          .filter(Objects::nonNull)
+          .map(j -> j.getProvider(JavaCompilationArgsProvider.class))
+          .filter(Objects::nonNull)
+          .map(JavaCompilationArgsProvider::getRuntimeJars)
+          .forEach(this::addTransitiveOnlyRuntimeJars);
       return this;
     }
 

src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java
index 0402192..798dbdf 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java
@@ -183,7 +183,7 @@
             .addProvider(JavaRuleOutputJarsProvider.class, ruleOutputJarsProvider)
             // TODO(bazel-team): this should only happen for java_plugin
             .addProvider(JavaPluginInfoProvider.class, pluginInfoProvider)
-            .maybeTransitiveOnlyRuntimeJarsToJavaInfo(common.getDependencies(), true)
+            .addTransitiveOnlyRuntimeJars(common.getDependencies())
             .setRuntimeJars(javaArtifacts.getRuntimeJars())
             .setJavaConstraints(JavaCommon.getConstraints(ruleContext))
             .setNeverlink(neverLink)