Aspect terminology update.

Aspect => ConfiguredAspect
AspectWithParameters => Aspect

--
MOS_MIGRATED_REVID=107375211

4 files changed, 13 insertions, 26 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/packages/AspectWithParameters.java b/src/main/java/com/google/devtools/build/lib/packages/Aspect.java
index 6f47f9a18c..017a5f3232 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/AspectWithParameters.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/Aspect.java
@@ -22,21 +22,21 @@ import java.util.Objects;
  * created with help of aspect factory instances and parameters are used to configure them, so we
  * have to keep them together.
  */
-public final class AspectWithParameters {
+public final class Aspect {
   // TODO(bazel-team): class objects are not really hashable or comparable for equality other than
   // by reference. We should identify the aspect here in a way that does not rely on comparison
   // by reference so that keys can be serialized and deserialized properly.
   private final AspectClass aspectClass;
   private final AspectParameters parameters;
 
-  public AspectWithParameters(AspectClass aspect, AspectParameters parameters) {
+  public Aspect(AspectClass aspect, AspectParameters parameters) {
     Preconditions.checkNotNull(aspect);
     Preconditions.checkNotNull(parameters);
     this.aspectClass = aspect;
     this.parameters = parameters;
   }
 
-  public AspectWithParameters(AspectClass aspect) {
+  public Aspect(AspectClass aspect) {
     this(aspect, AspectParameters.EMPTY);
   }
 
@@ -59,10 +59,10 @@ public final class AspectWithParameters {
     if (this == other) {
       return true;
     }
-    if (!(other instanceof AspectWithParameters)) {
+    if (!(other instanceof Aspect)) {
       return false;
     }
-    AspectWithParameters that = (AspectWithParameters) other;
+    Aspect that = (Aspect) other;
     return Objects.equals(this.aspectClass, that.aspectClass)
         && Objects.equals(this.parameters, that.parameters);
   }
@@ -74,7 +74,7 @@ public final class AspectWithParameters {
 
   @Override
   public String toString() {
-    return String.format("AspectWithParameters %s(%s)", aspectClass, parameters);
+    return String.format("Aspect %s(%s)", aspectClass, parameters);
   }
 
   public AspectDefinition getDefinition() {
diff --git a/src/main/java/com/google/devtools/build/lib/packages/AspectDefinition.java b/src/main/java/com/google/devtools/build/lib/packages/AspectDefinition.java
index 9b5b5b98f7..de9c5c3e81 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/AspectDefinition.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/AspectDefinition.java
@@ -32,8 +32,7 @@ import java.util.Map;
 import java.util.Set;
 
 /**
- * The definition of an aspect (see {@link com.google.devtools.build.lib.analysis.Aspect} for more
- * information.)
+ * The definition of an aspect (see {@link Aspect} for moreinformation.)
  *
  * <p>Contains enough information to build up the configured target graph except for the actual way
  * to build the Skyframe node (that is the territory of
@@ -145,7 +144,7 @@ public final class AspectDefinition {
     }
 
     LinkedHashMultimap<Attribute, Label> result = LinkedHashMultimap.create();
-    for (AspectWithParameters candidateClass : attribute.getAspectsWithParameters(from)) {
+    for (Aspect candidateClass : attribute.getAspects(from)) {
       // Check if target satisfies condition for this aspect (has to provide all required
       // TransitiveInfoProviders)
       if (!advertisedProviders.containsAll(
diff --git a/src/main/java/com/google/devtools/build/lib/packages/Attribute.java b/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
index d11efff42b..9e19e68c66 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
@@ -1332,25 +1332,13 @@ public final class Attribute implements Comparable<Attribute> {
   }
 
   /**
-   * Returns the set of aspects required for dependencies through this attribute.
+   * Returns the list of aspects required for dependencies through this attribute.
    */
-  public ImmutableSet<AspectClass> getAspects() {
-    ImmutableSet.Builder<AspectClass> builder = ImmutableSet.builder();
-    for (RuleAspect aspect : aspects) {
-      builder.add(aspect.getAspectFactory());
-    }
-    return builder.build();
-  }
-
-  /**
-   * Returns set of pairs of aspect factories and corresponding aspect parameters.
-   */
-  public ImmutableList<AspectWithParameters> getAspectsWithParameters(Rule rule) {
-    ImmutableList.Builder<AspectWithParameters> builder = ImmutableList.builder();
+  public ImmutableList<Aspect> getAspects(Rule rule) {
+    ImmutableList.Builder<Aspect> builder = ImmutableList.builder();
     for (RuleAspect aspect : aspects) {
       builder.add(
-          new AspectWithParameters(
-              aspect.getAspectFactory(), aspect.getParametersExtractor().apply(rule)));
+          new Aspect(aspect.getAspectFactory(), aspect.getParametersExtractor().apply(rule)));
     }
     return builder.build();
   }
diff --git a/src/main/java/com/google/devtools/build/lib/packages/Rule.java b/src/main/java/com/google/devtools/build/lib/packages/Rule.java
index 07f16509aa..027a943e90 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/Rule.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/Rule.java
@@ -737,7 +737,7 @@ public final class Rule implements Target {
       BinaryPredicate<Rule, Attribute> predicate) {
     LinkedHashMultimap<Attribute, Label> labels = LinkedHashMultimap.create();
     for (Attribute attribute : this.getAttributes()) {
-      for (AspectWithParameters candidateClass : attribute.getAspectsWithParameters(this)) {
+      for (Aspect candidateClass : attribute.getAspects(this)) {
         AspectDefinition.addAllAttributesOfAspect(
             Rule.this, labels, candidateClass.getDefinition(), predicate);
       }