Merge JavaSourceInfoProvider.

Author: iirina

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

@@ -15,6 +15,7 @@
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Streams;
 import com.google.devtools.build.lib.actions.Artifact;
@@ -43,8 +44,11 @@
 import com.google.devtools.build.lib.syntax.Runtime;
 import com.google.devtools.build.lib.syntax.SkylarkList;
 import com.google.devtools.build.lib.syntax.SkylarkNestedSet;
+import com.google.devtools.build.lib.vfs.PathFragment;
+
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Stream;
@@ -127,6 +131,7 @@ public static JavaInfo merge(List<JavaInfo> providers) {
         JavaInfo.fetchProvidersFromList(providers, JavaExportsProvider.class);
     List<JavaRuleOutputJarsProvider> javaRuleOutputJarsProviders =
         JavaInfo.fetchProvidersFromList(providers, JavaRuleOutputJarsProvider.class);
+    List<JavaSourceInfoProvider> sourceInfos = JavaInfo.fetchProvidersFromList(providers, JavaSourceInfoProvider.class);
 
     Runfiles mergedRunfiles = Runfiles.EMPTY;
     for (JavaRunfilesProvider javaRunfilesProvider : javaRunfilesProviders) {
@@ -141,12 +146,6 @@ public static JavaInfo merge(List<JavaInfo> providers) {
       javaConstraints.addAll(javaInfo.getJavaConstraints());
     }
 
-
-    // JavaCompilationInfoProvider
-
-    // JavaSourceInfoProvider
-
-
     return JavaInfo.Builder.create()
         .addProvider(
             JavaCompilationArgsProvider.class,
@@ -163,7 +162,9 @@ public static JavaInfo merge(List<JavaInfo> providers) {
         .addProvider(
             JavaPluginInfoProvider.class, JavaPluginInfoProvider.merge(javaPluginInfoProviders))
         .addProvider(JavaExportsProvider.class, JavaExportsProvider.merge(javaExportsProviders))
+        .addProvider(JavaSourceInfoProvider.class, JavaSourceInfoProvider.merge(sourceInfos))
         // TODO(b/65618333): add merge function to JavaGenJarsProvider. See #3769
+        // TODO(iirina): merge or remove JavaCompilationInfoProvider
         .setRuntimeJars(runtimeJars.build())
         .setJavaConstraints(javaConstraints.build())
         .build();

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

@@ -108,6 +108,30 @@ public static JavaSourceInfoProvider fromJavaTargetAttributes(
         .build();
   }
 
+  public static JavaSourceInfoProvider merge(Collection<JavaSourceInfoProvider> sourceInfos) {
+    JavaSourceInfoProvider.Builder javaSourceInfo = new JavaSourceInfoProvider.Builder();
+    ImmutableList.Builder<Artifact> jarFiles = new ImmutableList.Builder<>();
+    ImmutableMap.Builder<PathFragment, Artifact> resources = new ImmutableMap.Builder<>();
+    ImmutableList.Builder<Artifact> sourceFiles = new ImmutableList.Builder<>();
+    ImmutableList.Builder<Artifact> sourceJars = new ImmutableList.Builder<>();
+    ImmutableList.Builder<Artifact> sourceJarsForJarFiles = new ImmutableList.Builder<>();
+
+
+    for (JavaSourceInfoProvider sourceInfo : sourceInfos) {
+      jarFiles.addAll(sourceInfo.getJarFiles());
+      resources.putAll(sourceInfo.getResources());
+      sourceFiles.addAll(sourceInfo.getSourceFiles());
+      sourceJars.addAll(sourceInfo.getSourceJars());
+      sourceJarsForJarFiles.addAll(sourceInfo.getSourceJarsForJarFiles());
+    }
+    javaSourceInfo.setJarFiles(jarFiles.build());
+    javaSourceInfo.setResources(resources.build());
+    javaSourceInfo.setSourceFiles(sourceFiles.build());
+    javaSourceInfo.setSourceJars(sourceJars.build());
+    javaSourceInfo.setSourceJarsForJarFiles(sourceJarsForJarFiles.build());
+    return javaSourceInfo.build();
+  }
+
   /** Builder class for constructing JavaSourceInfoProviders. */
   public static final class Builder {
     private Collection<Artifact> sourceFiles = ImmutableList.<Artifact>of();