1 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/DeployArchiveBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/java/DeployArchiveBuilder.java
index 29379dcbf0..e110a34174 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/DeployArchiveBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/DeployArchiveBuilder.java
@@ -13,10 +13,13 @@
 // limitations under the License.
 package com.google.devtools.build.lib.rules.java;
 
+import static com.google.common.collect.ImmutableList.toImmutableList;
+
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
+import com.google.common.collect.Streams;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.ExecutionRequirements;
 import com.google.devtools.build.lib.actions.ParameterFile.ParameterFileType;
@@ -209,8 +212,9 @@ public class DeployArchiveBuilder {
       Function<Artifact, Artifact> derivedJarFunction) {
     IterablesChain.Builder<Artifact> inputs = IterablesChain.builder();
     inputs.add(
-        ImmutableList.copyOf(
-            Iterables.transform(attributes.getRuntimeClassPathForArchive(), derivedJarFunction)));
+        Streams.stream(attributes.getRuntimeClassPathForArchive())
+            .map(derivedJarFunction)
+            .collect(toImmutableList()));
     // TODO(bazel-team): Remove?  Resources not used as input to singlejar action
     inputs.add(ImmutableList.copyOf(attributes.getResources().values()));
     inputs.add(attributes.getClassPathResources());
@@ -237,7 +241,7 @@ public class DeployArchiveBuilder {
     IterablesChain.Builder<Artifact> inputs = IterablesChain.builder();
     inputs.add(getArchiveInputs(attributes, derivedJars));
 
-    inputs.add(ImmutableList.copyOf(Iterables.transform(runtimeJars, derivedJars)));
+    inputs.add(Streams.stream(runtimeJars).map(derivedJars).collect(toImmutableList()));
     if (runfilesMiddleman != null) {
       inputs.addElement(runfilesMiddleman);
     }