Skip to content

Commit

Permalink
Inline JavaLibraryHelper.Info.
Browse files Browse the repository at this point in the history
Only getCompilationArtifacts() is used, which simply passes through a field, so this CL inlines it.

--
MOS_MIGRATED_REVID=124043284
  • Loading branch information
cgrushko authored and meteorcloudy committed Jun 6, 2016
1 parent 696a4a7 commit a9301fa
Showing 1 changed file with 2 additions and 31 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,14 @@
import com.google.common.collect.Iterables;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.analysis.RuleContext;
import com.google.devtools.build.lib.analysis.TransitiveInfoProvider;
import com.google.devtools.build.lib.analysis.config.BuildConfiguration.StrictDepsMode;
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import com.google.devtools.build.lib.rules.java.JavaConfiguration.JavaClasspathMode;
import com.google.devtools.build.lib.util.Preconditions;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;

/**
* A class to create Java compile actions in a way that is consistent with java_library. Rules that
Expand All @@ -44,28 +40,6 @@
public final class JavaLibraryHelper {
private static final String DEFAULT_SUFFIX_IS_EMPTY_STRING = "";

/**
* Contains the providers as well as the compilation outputs.
*/
public static final class Info {
private final Map<Class<? extends TransitiveInfoProvider>, TransitiveInfoProvider> providers;
private final JavaCompilationArtifacts compilationArtifacts;

private Info(Map<Class<? extends TransitiveInfoProvider>, TransitiveInfoProvider> providers,
JavaCompilationArtifacts compilationArtifacts) {
this.providers = Collections.unmodifiableMap(providers);
this.compilationArtifacts = compilationArtifacts;
}

public Map<Class<? extends TransitiveInfoProvider>, TransitiveInfoProvider> getProviders() {
return providers;
}

public JavaCompilationArtifacts getCompilationArtifacts() {
return compilationArtifacts;
}
}

private final RuleContext ruleContext;
private final String implicitAttributesSuffix;

Expand Down Expand Up @@ -147,7 +121,7 @@ public JavaLibraryHelper setStrictDepsMode(StrictDepsMode strictDepsMode) {
/**
* Creates the compile actions and providers.
*/
public Info build(JavaSemantics semantics) {
public JavaCompilationArtifacts build(JavaSemantics semantics) {
Preconditions.checkState(output != null, "must have an output file; use setOutput()");
JavaTargetAttributes.Builder attributes = new JavaTargetAttributes.Builder(semantics);
attributes.addSourceJars(sourceJars);
Expand All @@ -174,11 +148,8 @@ public Info build(JavaSemantics semantics) {
null /* outputMetadata */);
helper.createCompileTimeJarAction(output, artifactsBuilder);
artifactsBuilder.addRuntimeJar(output);
JavaCompilationArtifacts compilationArtifacts = artifactsBuilder.build();

Map<Class<? extends TransitiveInfoProvider>, TransitiveInfoProvider> providers =
new LinkedHashMap<>();
return new Info(providers, compilationArtifacts);
return artifactsBuilder.build();
}

private void addDepsToAttributes(JavaTargetAttributes.Builder attributes) {
Expand Down

0 comments on commit a9301fa

Please sign in to comment.