Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove merging of java_outputs in JavaPluginInfo. #14288

Closed
wants to merge 2 commits into from
Closed

Remove merging of java_outputs in JavaPluginInfo. #14288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02ef4cd
Remove java_outputs merge in JavaPluginInfo.
comius Nov 17, 2021
a1409a8
Rename merge method to make it clear it disregards outputs.
comius Nov 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,7 @@ private JavaPluginInfo collectPlugins() {
Iterables.addAll(result, getDirectJavaPluginInfoForAttribute(ruleContext, ":java_plugins"));
Iterables.addAll(result, getDirectJavaPluginInfoForAttribute(ruleContext, "plugins"));
Iterables.addAll(result, getExportedJavaPluginInfoForAttribute(ruleContext, "deps"));
return JavaPluginInfo.merge(result);
return JavaPluginInfo.mergeWithoutJavaOutputs(result);
}

private static Iterable<JavaPluginInfo> getDirectJavaPluginInfoForAttribute(
Expand Down Expand Up @@ -841,7 +841,7 @@ private static ImmutableSet<String> getProcessorClasses(RuleContext ruleContext)
}

public static JavaPluginInfo getTransitivePlugins(RuleContext ruleContext) {
return JavaPluginInfo.merge(
return JavaPluginInfo.mergeWithoutJavaOutputs(
Iterables.concat(
getDirectJavaPluginInfoForAttribute(ruleContext, "exported_plugins"),
getExportedJavaPluginInfoForAttribute(ruleContext, "exports")));
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/google/devtools/build/lib/rules/java/JavaInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public static JavaInfo merge(List<JavaInfo> providers, boolean withExportsProvid
.addProvider(
JavaRuleOutputJarsProvider.class,
JavaRuleOutputJarsProvider.merge(javaRuleOutputJarsProviders))
.javaPluginInfo(JavaPluginInfo.merge(javaPluginInfos))
.javaPluginInfo(JavaPluginInfo.mergeWithoutJavaOutputs(javaPluginInfos))
.addProvider(JavaCcInfoProvider.class, JavaCcInfoProvider.merge(javaCcInfoProviders))
// TODO(b/65618333): add merge function to JavaGenJarsProvider. See #3769
// TODO(iirina): merge or remove JavaCompilationInfoProvider
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/google/devtools/build/lib/rules/java/JavaInfoBuildHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ private JavaExportsProvider createJavaExportsProvider(Iterable<JavaInfo> exports

private JavaPluginInfo mergeExportedJavaPluginInfo(
Iterable<JavaPluginInfo> plugins, Iterable<JavaInfo> javaInfos) {
return JavaPluginInfo.merge(
return JavaPluginInfo.mergeWithoutJavaOutputs(
concat(
plugins,
stream(javaInfos)
Expand Down
11 changes: 5 additions & 6 deletions src/main/java/com/google/devtools/build/lib/rules/java/JavaPluginInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,21 +162,20 @@ private JavaPluginData disableAnnotationProcessing() {
}
}

public static JavaPluginInfo merge(JavaPluginInfo a, JavaPluginInfo b) {
return a.isEmpty() ? b : b.isEmpty() ? a : merge(ImmutableList.of(a, b));
public static JavaPluginInfo mergeWithoutJavaOutputs(JavaPluginInfo a, JavaPluginInfo b) {
return a.isEmpty() ? b : b.isEmpty() ? a : mergeWithoutJavaOutputs(ImmutableList.of(a, b));
}

public static JavaPluginInfo merge(Iterable<JavaPluginInfo> providers) {
public static JavaPluginInfo mergeWithoutJavaOutputs(Iterable<JavaPluginInfo> providers) {
List<JavaPluginData> plugins = new ArrayList<>();
List<JavaPluginData> apiGeneratingPlugins = new ArrayList<>();
ImmutableList.Builder<JavaOutput> outputs = ImmutableList.builder();
for (JavaPluginInfo provider : providers) {
plugins.add(provider.plugins());
apiGeneratingPlugins.add(provider.apiGeneratingPlugins());
outputs.addAll(provider.getJavaOutputs());
}
return new AutoValue_JavaPluginInfo(
outputs.build(), JavaPluginData.merge(plugins), JavaPluginData.merge(apiGeneratingPlugins));
ImmutableList.of(), JavaPluginData.merge(plugins),
JavaPluginData.merge(apiGeneratingPlugins));
}

public static JavaPluginInfo create(
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/google/devtools/build/lib/rules/java/JavaPluginsFlagAliasRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public ConfiguredTarget create(RuleContext ruleContext)
}

JavaPluginInfo javaPluginInfo =
JavaPluginInfo.merge(
JavaPluginInfo.mergeWithoutJavaOutputs(
ruleContext.getPrerequisites(":java_plugins", JavaPluginInfo.PROVIDER));

return new RuleConfiguredTargetBuilder(ruleContext)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/google/devtools/build/lib/rules/java/JavaTargetAttributes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ public Builder addResourceJars(NestedSet<Artifact> resourceJars) {

public Builder addPlugin(JavaPluginInfo plugins) {
Preconditions.checkArgument(!built);
this.plugins = JavaPluginInfo.merge(this.plugins, plugins);
this.plugins = JavaPluginInfo.mergeWithoutJavaOutputs(this.plugins, plugins);
return this;
}

Expand Down