commit 242e69117b2e7bb00e777f184a98fef8893f0594
author tomlu <tomlu@google.com> Mon Aug 21 16:26:41 2017 +0200
committer Damien Martin-Guillerez <dmarting@google.com> Tue Aug 22 09:13:17 2017 +0200
tree a33b920b1d93a304f4129fc29869441d1e9350ee
parent 375f95b16e1a8b164d2caaa4d65a4c9b4e310bd3

Stop using CustomMultiArgv in OneVersionCheckActionBuilder.

PiperOrigin-RevId: 165925128

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

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/OneVersionCheckActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/java/OneVersionCheckActionBuilder.java
index eeaede2..8daf0e7 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/OneVersionCheckActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/OneVersionCheckActionBuilder.java
@@ -16,13 +16,11 @@
 
 import static com.google.devtools.build.lib.util.Preconditions.checkNotNull;
 
-import com.google.common.base.Joiner;
-import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.ParameterFile.ParameterFileType;
 import com.google.devtools.build.lib.analysis.RuleContext;
 import com.google.devtools.build.lib.analysis.actions.CustomCommandLine;
-import com.google.devtools.build.lib.analysis.actions.CustomCommandLine.CustomMultiArgv;
+import com.google.devtools.build.lib.analysis.actions.CustomCommandLine.VectorArg;
 import com.google.devtools.build.lib.analysis.actions.SpawnAction;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
@@ -94,7 +92,8 @@
     if (enforcementLevel == OneVersionEnforcementLevel.WARNING) {
       oneVersionArgsBuilder.add("--succeed_on_found_violations");
     }
-    oneVersionArgsBuilder.addCustomMultiArgv(new OneVersionJarMapArgv(jarsToCheck));
+    oneVersionArgsBuilder.add("--inputs", VectorArg.of(jarsToCheck).mapEach(
+        OneVersionCheckActionBuilder::jarAndTargetArg));
     CustomCommandLine oneVersionArgs = oneVersionArgsBuilder.build();
     ruleContext.registerAction(
         new SpawnAction.Builder()
@@ -110,35 +109,17 @@
     return outputArtifact;
   }
 
-  private static class OneVersionJarMapArgv extends CustomMultiArgv {
+  private static String jarAndTargetArg(Artifact jar) {
+    return jar.getExecPathString() + "," + getArtifactOwnerGeneralizedLabel(jar);
+  }
 
-    private static final Joiner COMMA_JOINER = Joiner.on(',');
-    private final Iterable<Artifact> classPathJars;
-
-    private OneVersionJarMapArgv(Iterable<Artifact> classPathJars) {
-      this.classPathJars = classPathJars;
-    }
-
-    @Override
-    public Iterable<String> argv() {
-      ImmutableList.Builder<String> args = ImmutableList.builder();
-      args.add("--inputs");
-      for (Artifact classPathJar : classPathJars) {
-        args.add(
-            COMMA_JOINER.join(
-                classPathJar.getExecPathString(), getArtifactOwnerGeneralizedLabel(classPathJar)));
-      }
-      return args.build();
-    }
-
-    private static String getArtifactOwnerGeneralizedLabel(Artifact artifact) {
-      Label label = checkNotNull(artifact.getArtifactOwner(), artifact).getLabel();
-      return
-          label.getPackageIdentifier().getRepository().isDefault()
-                  || label.getPackageIdentifier().getRepository().isMain()
-              ? label.toString()
-              // Escape '@' prefix for .params file.
-              : "@" + label;
-    }
+  private static String getArtifactOwnerGeneralizedLabel(Artifact artifact) {
+    Label label = checkNotNull(artifact.getArtifactOwner(), artifact).getLabel();
+    return
+        label.getPackageIdentifier().getRepository().isDefault()
+            || label.getPackageIdentifier().getRepository().isMain()
+            ? label.toString()
+            // Escape '@' prefix for .params file.
+            : "@" + label;
   }
 }