Minor readability cleanup.

RELNOTES: None
PiperOrigin-RevId: 205825362

1 files changed, 14 insertions, 38 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java
index e88782951d..a4572d9ae4 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java
@@ -23,7 +23,6 @@ import com.google.common.collect.Iterables;
 import com.google.devtools.build.lib.actions.ActionAnalysisMetadata;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.AnalysisEnvironment;
-import com.google.devtools.build.lib.analysis.AnalysisUtils;
 import com.google.devtools.build.lib.analysis.OutputGroupInfo;
 import com.google.devtools.build.lib.analysis.PrerequisiteArtifacts;
 import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder;
@@ -43,16 +42,12 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.collect.nestedset.Order;
 import com.google.devtools.build.lib.packages.BuildType;
-import com.google.devtools.build.lib.packages.BuiltinProvider;
-import com.google.devtools.build.lib.packages.Info;
-import com.google.devtools.build.lib.packages.NativeProvider;
 import com.google.devtools.build.lib.packages.Target;
 import com.google.devtools.build.lib.packages.TargetUtils;
 import com.google.devtools.build.lib.rules.cpp.LinkerInput;
 import com.google.devtools.build.lib.rules.java.JavaCompilationArgsProvider.ClasspathType;
 import com.google.devtools.build.lib.syntax.Type;
 import com.google.devtools.build.lib.util.FileTypeSet;
-import com.google.devtools.build.lib.util.Pair;
 import com.google.devtools.build.lib.vfs.FileSystemUtils;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import java.util.ArrayList;
@@ -201,7 +196,7 @@ public class JavaCommon {
   public static ImmutableList<String> getConstraints(RuleContext ruleContext) {
     return ruleContext.getRule().isAttrDefined("constraints", Type.STRING_LIST)
         ? ImmutableList.copyOf(ruleContext.attributes().get("constraints", Type.STRING_LIST))
-        : ImmutableList.<String>of();
+        : ImmutableList.of();
   }
 
   public void setClassPathFragment(ClasspathConfiguredFragment classpathFragment) {
@@ -236,8 +231,11 @@ public class JavaCommon {
         if (buffer.length() > 0) {
           buffer.append(':');
         }
-        buffer.append("${JAVA_RUNFILES}/" + runfilePrefix + "/");
-        buffer.append(entry.getPathString());
+        buffer
+            .append("${JAVA_RUNFILES}/")
+            .append(runfilePrefix)
+            .append("/")
+            .append(entry.getPathString());
       }
     }
     return buffer.toString();
@@ -257,13 +255,13 @@ public class JavaCommon {
         /* isNeverLink= */ isNeverLink,
         /* srcLessDepsExport= */ srcLessDepsExport,
         getJavaCompilationArtifacts(),
-        ImmutableList.of(
+        /* deps= */ ImmutableList.of(
             JavaCompilationArgsProvider.legacyFromTargets(
                 targetsTreatedAsDeps(ClasspathType.COMPILE_ONLY), javaProtoLibraryStrictDeps)),
-        ImmutableList.of(
+        /* runtimeDeps= */ ImmutableList.of(
             JavaCompilationArgsProvider.legacyFromTargets(
                 getRuntimeDeps(ruleContext), javaProtoLibraryStrictDeps)),
-        ImmutableList.of(
+        /* exports= */ ImmutableList.of(
             JavaCompilationArgsProvider.legacyFromTargets(
                 getExports(ruleContext), javaProtoLibraryStrictDeps)));
   }
@@ -292,18 +290,6 @@ public class JavaCommon {
   }
 
   /**
-   * Collects Java dependency artifacts for this target.
-   *
-   * @param outDeps output (compile-time) dependency artifact of this target
-   */
-  public NestedSet<Artifact> collectCompileTimeDependencyArtifacts(@Nullable Artifact outDeps) {
-    return collectCompileTimeDependencyArtifacts(
-        outDeps,
-        JavaInfo.getProvidersFromListOfTargets(
-            JavaCompilationArgsProvider.class, getExports(ruleContext)));
-  }
-
-  /**
    * Collects Java dependency artifacts for a target.
    *
    * @param jdeps dependency artifact of this target
@@ -564,7 +550,7 @@ public class JavaCommon {
   }
 
   public JavaTargetAttributes.Builder initCommon() {
-    return initCommon(ImmutableList.<Artifact>of(), getCompatibleJavacOptions());
+    return initCommon(ImmutableList.of(), getCompatibleJavacOptions());
   }
 
   private ImmutableList<String> getCompatibleJavacOptions() {
@@ -696,9 +682,9 @@ public class JavaCommon {
         instrumentationSpec,
         JAVA_METADATA_COLLECTOR,
         filesToBuild,
-        NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER),
-        NestedSetBuilder.<Pair<String, String>>emptySet(Order.STABLE_ORDER),
-        /*withBaselineCoverage*/!TargetUtils.isTestRule(ruleContext.getTarget()));
+        NestedSetBuilder.emptySet(Order.STABLE_ORDER),
+        NestedSetBuilder.emptySet(Order.STABLE_ORDER),
+        /*withBaselineCoverage*/ !TargetUtils.isTestRule(ruleContext.getTarget()));
   }
 
   public void addGenJarsProvider(
@@ -827,7 +813,7 @@ public class JavaCommon {
   private static ImmutableSet<String> getProcessorClasses(RuleContext ruleContext) {
     return ruleContext.getRule().isAttributeValueExplicitlySpecified("processor_class")
         ? ImmutableSet.of(ruleContext.attributes().get("processor_class", Type.STRING))
-        : ImmutableSet.<String>of();
+        : ImmutableSet.of();
   }
 
   public static JavaPluginInfoProvider getTransitivePlugins(RuleContext ruleContext) {
@@ -885,16 +871,6 @@ public class JavaCommon {
     return JavaInfo.getProvidersFromListOfTargets(provider, getDependencies());
   }
 
-  /** Gets all the deps that implement a particular provider. */
-  public final <P extends Info> Iterable<P> getDependencies(NativeProvider<P> provider) {
-    return AnalysisUtils.getProviders(getDependencies(), provider);
-  }
-
-  /** Gets all the deps that implement a particular provider. */
-  public final <P extends Info> Iterable<P> getDependencies(BuiltinProvider<P> provider) {
-    return AnalysisUtils.getProviders(getDependencies(), provider);
-  }
-
   /**
    * Returns true if and only if this target has the neverlink attribute set to
    * 1, or false if the neverlink attribute does not exist (for example, on