Aspect terminology update.
Aspect => ConfiguredAspect
AspectWithParameters => Aspect
--
MOS_MIGRATED_REVID=107375211
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/AspectDefinitionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/AspectDefinitionTest.java
index 973a469..c413271 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/AspectDefinitionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/AspectDefinitionTest.java
@@ -47,7 +47,8 @@
}
@Override
- public Aspect create(ConfiguredTarget base, RuleContext context, AspectParameters parameters) {
+ public ConfiguredAspect create(
+ ConfiguredTarget base, RuleContext context, AspectParameters parameters) {
throw new IllegalStateException();
}
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java b/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
index 7341ba1..9616dff 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
@@ -237,13 +237,15 @@
}
@Override
- public Aspect create(ConfiguredTarget base,
- RuleContext ruleContext, AspectParameters parameters) throws InterruptedException {
+ public ConfiguredAspect create(
+ ConfiguredTarget base, RuleContext ruleContext, AspectParameters parameters)
+ throws InterruptedException {
Object lateBoundPrereq = ruleContext.getPrerequisite(":late", TARGET);
- return new Aspect.Builder("testaspect")
+ return new ConfiguredAspect.Builder("testaspect")
.addProvider(
- new AspectInfo(NestedSetBuilder.create(
- Order.STABLE_ORDER, lateBoundPrereq != null ? "non-empty" : "empty")))
+ new AspectInfo(
+ NestedSetBuilder.create(
+ Order.STABLE_ORDER, lateBoundPrereq != null ? "non-empty" : "empty")))
.build();
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/DependencyResolverTest.java b/src/test/java/com/google/devtools/build/lib/analysis/DependencyResolverTest.java
index 5a190d5..3bf70e8 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/DependencyResolverTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/DependencyResolverTest.java
@@ -26,7 +26,7 @@
import com.google.devtools.build.lib.analysis.util.TestAspects;
import com.google.devtools.build.lib.analysis.util.TestAspects.AspectRequiringRule;
import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.packages.AspectWithParameters;
+import com.google.devtools.build.lib.packages.Aspect;
import com.google.devtools.build.lib.packages.Attribute;
import com.google.devtools.build.lib.packages.NativeAspectClass;
import com.google.devtools.build.lib.packages.NoSuchThingException;
@@ -113,7 +113,7 @@
return dependencyResolver.dependentNodeMap(
new TargetAndConfiguration(target, getTargetConfiguration()),
getHostConfiguration(),
- aspect != null ? new AspectWithParameters(new NativeAspectClass<T>(aspect)) : null,
+ aspect != null ? new Aspect(new NativeAspectClass<T>(aspect)) : null,
ImmutableSet.<ConfigMatchingProvider>of());
}
@@ -122,7 +122,7 @@
ListMultimap<Attribute, Dependency> dependentNodeMap,
String attrName,
String dep,
- AspectWithParameters... aspects) {
+ Aspect... aspects) {
Attribute attr = null;
for (Attribute candidate : dependentNodeMap.keySet()) {
if (candidate.getName().equals(attrName)) {
@@ -152,10 +152,7 @@
"aspect(name='b', foo=[])");
ListMultimap<Attribute, Dependency> map = dependentNodeMap("//a:a", null);
assertDep(
- map,
- "foo",
- "//a:b",
- new AspectWithParameters(new NativeAspectClass(TestAspects.SimpleAspect.class)));
+ map, "foo", "//a:b", new Aspect(new NativeAspectClass(TestAspects.SimpleAspect.class)));
}
@Test
@@ -167,10 +164,7 @@
ListMultimap<Attribute, Dependency> map =
dependentNodeMap("//a:a", TestAspects.AttributeAspect.class);
assertDep(
- map,
- "foo",
- "//a:b",
- new AspectWithParameters(new NativeAspectClass(TestAspects.AttributeAspect.class)));
+ map, "foo", "//a:b", new Aspect(new NativeAspectClass(TestAspects.AttributeAspect.class)));
}
@Test
@@ -205,18 +199,18 @@
BuildConfiguration host = getHostConfiguration();
BuildConfiguration target = getTargetConfiguration();
- ImmutableSet<AspectWithParameters> twoAspects =
+ ImmutableSet<Aspect> twoAspects =
ImmutableSet.of(
- new AspectWithParameters(new NativeAspectClass(TestAspects.SimpleAspect.class)),
- new AspectWithParameters(new NativeAspectClass(TestAspects.AttributeAspect.class)));
- ImmutableSet<AspectWithParameters> inverseAspects =
+ new Aspect(new NativeAspectClass(TestAspects.SimpleAspect.class)),
+ new Aspect(new NativeAspectClass(TestAspects.AttributeAspect.class)));
+ ImmutableSet<Aspect> inverseAspects =
ImmutableSet.of(
- new AspectWithParameters(new NativeAspectClass(TestAspects.AttributeAspect.class)),
- new AspectWithParameters(new NativeAspectClass(TestAspects.SimpleAspect.class)));
- ImmutableSet<AspectWithParameters> differentAspects =
+ new Aspect(new NativeAspectClass(TestAspects.AttributeAspect.class)),
+ new Aspect(new NativeAspectClass(TestAspects.SimpleAspect.class)));
+ ImmutableSet<Aspect> differentAspects =
ImmutableSet.of(
- new AspectWithParameters(new NativeAspectClass(TestAspects.AttributeAspect.class)),
- new AspectWithParameters(new NativeAspectClass(TestAspects.ErrorAspect.class)));
+ new Aspect(new NativeAspectClass(TestAspects.AttributeAspect.class)),
+ new Aspect(new NativeAspectClass(TestAspects.ErrorAspect.class)));
new EqualsTester()
.addEqualityGroup(
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/TestAspects.java b/src/test/java/com/google/devtools/build/lib/analysis/util/TestAspects.java
index 0a67c92..f6d650d 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/TestAspects.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/TestAspects.java
@@ -26,7 +26,7 @@
import com.google.common.collect.ImmutableCollection;
import com.google.common.collect.Iterables;
import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.analysis.Aspect;
+import com.google.devtools.build.lib.analysis.ConfiguredAspect;
import com.google.devtools.build.lib.analysis.ConfiguredNativeAspectFactory;
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
import com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode;
@@ -149,16 +149,16 @@
*/
public abstract static class BaseAspect implements ConfiguredNativeAspectFactory {
@Override
- public Aspect create(ConfiguredTarget base, RuleContext ruleContext,
- AspectParameters parameters) {
+ public ConfiguredAspect create(
+ ConfiguredTarget base, RuleContext ruleContext, AspectParameters parameters) {
String information = parameters.isEmpty()
? ""
: " data " + Iterables.getFirst(parameters.getAttribute("baz"), null);
- return new Aspect.Builder(getClass().getName())
+ return new ConfiguredAspect.Builder(getClass().getName())
.addProvider(
AspectInfo.class,
- new AspectInfo(collectAspectData("aspect " + ruleContext.getLabel() + information,
- ruleContext)))
+ new AspectInfo(
+ collectAspectData("aspect " + ruleContext.getLabel() + information, ruleContext)))
.build();
}
}
@@ -249,7 +249,7 @@
return builder.build();
}
- public Aspect create(
+ public ConfiguredAspect create(
ConfiguredTarget base, RuleContext ruleContext, AspectParameters parameters) {
StringBuilder information = new StringBuilder("aspect " + ruleContext.getLabel());
if (!parameters.isEmpty()) {
@@ -264,7 +264,7 @@
information.append(dep.getLabel());
}
information.append("]");
- return new Aspect.Builder(getClass().getName())
+ return new ConfiguredAspect.Builder(getClass().getName())
.addProvider(
AspectInfo.class,
new AspectInfo(collectAspectData(information.toString(), ruleContext)))
@@ -283,8 +283,8 @@
*/
public static class ErrorAspect implements ConfiguredNativeAspectFactory {
@Override
- public Aspect create(ConfiguredTarget base, RuleContext ruleContext,
- AspectParameters parameters) {
+ public ConfiguredAspect create(
+ ConfiguredTarget base, RuleContext ruleContext, AspectParameters parameters) {
ruleContext.ruleError("Aspect error");
return null;
}
diff --git a/src/test/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspectTestBase.java b/src/test/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspectTestBase.java
index 84b9553..2dd238e 100644
--- a/src/test/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspectTestBase.java
+++ b/src/test/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspectTestBase.java
@@ -22,8 +22,8 @@
import com.google.common.collect.Lists;
import com.google.common.eventbus.EventBus;
import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.analysis.Aspect;
import com.google.devtools.build.lib.analysis.BuildView.AnalysisResult;
+import com.google.devtools.build.lib.analysis.ConfiguredAspect;
import com.google.devtools.build.lib.analysis.OutputGroupProvider;
import com.google.devtools.build.lib.analysis.actions.BinaryFileWriteAction;
import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
@@ -78,7 +78,7 @@
};
private AnalysisResult analysisResult;
- private Aspect aspect;
+ private ConfiguredAspect configuredAspect;
protected static String jarString(String base, String jar, String iJar, String sourceJar) {
StringBuilder sb = new StringBuilder();
@@ -118,14 +118,14 @@
Collection<AspectValue> aspects = analysisResult.getAspects();
assertThat(aspects.size()).isEqualTo(1);
AspectValue value = aspects.iterator().next();
- this.aspect = value.getAspect();
- assertThat(aspect.getName()).isEqualTo(AndroidStudioInfoAspect.NAME);
+ this.configuredAspect = value.getConfiguredAspect();
+ assertThat(configuredAspect.getName()).isEqualTo(AndroidStudioInfoAspect.NAME);
}
protected Map<String, RuleIdeInfo> buildRuleIdeInfo(String target) throws Exception {
buildTarget(target);
AndroidStudioInfoFilesProvider provider =
- aspect.getProvider(AndroidStudioInfoFilesProvider.class);
+ configuredAspect.getProvider(AndroidStudioInfoFilesProvider.class);
Iterable<Artifact> artifacts = provider.getIdeInfoFiles();
ImmutableMap.Builder<String, RuleIdeInfo> builder = ImmutableMap.builder();
for (Artifact artifact : artifacts) {
@@ -138,7 +138,8 @@
}
protected List<String> getOutputGroupResult(String outputGroup) {
- OutputGroupProvider outputGroupProvider = this.aspect.getProvider(OutputGroupProvider.class);
+ OutputGroupProvider outputGroupProvider =
+ this.configuredAspect.getProvider(OutputGroupProvider.class);
assert outputGroupProvider != null;
NestedSet<Artifact> artifacts = outputGroupProvider.getOutputGroup(outputGroup);
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java
index 7633d4f..2b02bc1 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java
@@ -71,7 +71,7 @@
public String apply(AspectValue aspectValue) {
return String.format(
"%s(%s)",
- aspectValue.getAspect().getName(),
+ aspectValue.getConfiguredAspect().getName(),
aspectValue.getLabel().toString());
}
}))
@@ -122,7 +122,8 @@
}))
.containsExactly("//test:xxx");
AspectValue aspectValue = analysisResult.getAspects().iterator().next();
- SkylarkProviders skylarkProviders = aspectValue.getAspect().getProvider(SkylarkProviders.class);
+ SkylarkProviders skylarkProviders =
+ aspectValue.getConfiguredAspect().getProvider(SkylarkProviders.class);
assertThat(skylarkProviders).isNotNull();
Object names = skylarkProviders.getValue("target_labels");
assertThat(names).isInstanceOf(SkylarkNestedSet.class);
