[Refactor]: This CL refactors a few things in ComponentDescriptor.

  * Moves `abstract` methods in `ComponentDescriptor` to the top of the class so that it's easier to tell which methods contributes to the AutoValue equals/hashcode.
  * Moves `ComponentDescriptorFactory` directly to a nested class, `ComponentDescriptor.Factory`, to be more consistent with how structure other descriptors like `ModuleDescriptor`/`ModuleDescriptor.Factory`.
  * Moves `CancellationPolicy` class definition out of `ComponentDescriptor` since it's not directly related to that class.

RELNOTES=N/A
PiperOrigin-RevId: 563667275

java/dagger/internal/codegen/binding/CancellationPolicy.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2023 The Dagger Authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package dagger.internal.codegen.binding;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static dagger.internal.codegen.xprocessing.XElements.getSimpleName;
+
+import androidx.room.compiler.processing.XAnnotation;
+import dagger.internal.codegen.javapoet.TypeNames;
+import dagger.internal.codegen.xprocessing.XAnnotations;
+
+/**
+ * The cancellation policy for a {@link dagger.producers.ProductionComponent}.
+ *
+ * <p>@see dagger.producers.CancellationPolicy
+ */
+public enum CancellationPolicy {
+  PROPAGATE,
+  IGNORE;
+
+  static CancellationPolicy from(XAnnotation annotation) {
+    checkArgument(XAnnotations.getClassName(annotation).equals(TypeNames.CANCELLATION_POLICY));
+    return valueOf(getSimpleName(annotation.getAsEnum("fromSubcomponents")));
+  }
+}

java/dagger/internal/codegen/javac/BUILD

@@ -25,9 +25,7 @@ java_library(
     plugins = ["//java/dagger/internal/codegen:component-codegen"],
     deps = [
         "//java/dagger:core",
-        "//java/dagger/internal/codegen/binding",
         "//java/dagger/internal/codegen/compileroption",
-        "//java/dagger/internal/codegen/langmodel",
         "//java/dagger/internal/codegen/xprocessing",
         "//third_party/java/guava/collect",
     ],

java/dagger/internal/codegen/javac/JavacPluginModule.java

@@ -24,15 +24,13 @@
 import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
-import dagger.internal.codegen.binding.BindingGraphFactory;
-import dagger.internal.codegen.binding.ComponentDescriptorFactory;
 import dagger.internal.codegen.compileroption.CompilerOptions;
 import javax.lang.model.util.Elements; // ALLOW_TYPES_ELEMENTS
 import javax.lang.model.util.Types; // ALLOW_TYPES_ELEMENTS
 
 /**
- * A module that provides a {@link BindingGraphFactory} and {@link ComponentDescriptorFactory} for
- * use in {@code javac} plugins. Requires a binding for the {@code javac} {@link Context}.
+ * A module that provides a {@link XMessager}, {@link XProcessingEnv}, and {@link CompilerOptions}
+ * for use in {@code javac} plugins. Requires a binding for the {@code javac} {@link Context}.
  */
 @Module(includes = JavacPluginModule.BindsModule.class)
 public final class JavacPluginModule {

java/dagger/internal/codegen/kythe/DaggerKythePlugin.java

@@ -40,7 +40,7 @@
 import dagger.internal.codegen.binding.BindingDeclaration;
 import dagger.internal.codegen.binding.BindingGraphFactory;
 import dagger.internal.codegen.binding.BindingNode;
-import dagger.internal.codegen.binding.ComponentDescriptorFactory;
+import dagger.internal.codegen.binding.ComponentDescriptor;
 import dagger.internal.codegen.binding.ModuleDescriptor;
 import dagger.internal.codegen.javac.JavacPluginModule;
 import dagger.internal.codegen.javapoet.TypeNames;
@@ -64,7 +64,7 @@ public class DaggerKythePlugin extends Plugin.Scanner<Void, Void> {
   // TODO(ronshapiro): use flogger
   private static final Logger logger = Logger.getLogger(DaggerKythePlugin.class.getCanonicalName());
   private FactEmitter emitter;
-  @Inject ComponentDescriptorFactory componentDescriptorFactory;
+  @Inject ComponentDescriptor.Factory componentDescriptorFactory;
   @Inject BindingGraphFactory bindingGraphFactory;
   @Inject XProcessingEnv xProcessingEnv;
 

java/dagger/internal/codegen/processingstep/ComponentHjarProcessingStep.java

@@ -28,7 +28,6 @@
 import dagger.internal.codegen.base.SourceFileGenerator;
 import dagger.internal.codegen.binding.BindingGraph;
 import dagger.internal.codegen.binding.ComponentDescriptor;
-import dagger.internal.codegen.binding.ComponentDescriptorFactory;
 import dagger.internal.codegen.validation.ComponentCreatorValidator;
 import dagger.internal.codegen.validation.ComponentValidator;
 import dagger.internal.codegen.validation.ValidationReport;
@@ -52,15 +51,15 @@ final class ComponentHjarProcessingStep extends TypeCheckingProcessingStep<XType
   private final XMessager messager;
   private final ComponentValidator componentValidator;
   private final ComponentCreatorValidator creatorValidator;
-  private final ComponentDescriptorFactory componentDescriptorFactory;
+  private final ComponentDescriptor.Factory componentDescriptorFactory;
   private final SourceFileGenerator<ComponentDescriptor> componentGenerator;
 
   @Inject
   ComponentHjarProcessingStep(
       XMessager messager,
       ComponentValidator componentValidator,
       ComponentCreatorValidator creatorValidator,
-      ComponentDescriptorFactory componentDescriptorFactory,
+      ComponentDescriptor.Factory componentDescriptorFactory,
       SourceFileGenerator<ComponentDescriptor> componentGenerator) {
     this.messager = messager;
     this.componentValidator = componentValidator;

java/dagger/internal/codegen/processingstep/ComponentProcessingStep.java

@@ -34,7 +34,6 @@
 import dagger.internal.codegen.binding.BindingGraph;
 import dagger.internal.codegen.binding.BindingGraphFactory;
 import dagger.internal.codegen.binding.ComponentDescriptor;
-import dagger.internal.codegen.binding.ComponentDescriptorFactory;
 import dagger.internal.codegen.validation.BindingGraphValidator;
 import dagger.internal.codegen.validation.ComponentCreatorValidator;
 import dagger.internal.codegen.validation.ComponentDescriptorValidator;
@@ -52,7 +51,7 @@ final class ComponentProcessingStep extends TypeCheckingProcessingStep<XTypeElem
   private final ComponentValidator componentValidator;
   private final ComponentCreatorValidator creatorValidator;
   private final ComponentDescriptorValidator componentDescriptorValidator;
-  private final ComponentDescriptorFactory componentDescriptorFactory;
+  private final ComponentDescriptor.Factory componentDescriptorFactory;
   private final BindingGraphFactory bindingGraphFactory;
   private final SourceFileGenerator<BindingGraph> componentGenerator;
   private final BindingGraphValidator bindingGraphValidator;
@@ -63,7 +62,7 @@ final class ComponentProcessingStep extends TypeCheckingProcessingStep<XTypeElem
       ComponentValidator componentValidator,
       ComponentCreatorValidator creatorValidator,
       ComponentDescriptorValidator componentDescriptorValidator,
-      ComponentDescriptorFactory componentDescriptorFactory,
+      ComponentDescriptor.Factory componentDescriptorFactory,
       BindingGraphFactory bindingGraphFactory,
       SourceFileGenerator<BindingGraph> componentGenerator,
       BindingGraphValidator bindingGraphValidator) {
@@ -132,7 +131,10 @@ private void processSubcomponent(XTypeElement subcomponent) {
       return;
     }
     BindingGraph fullBindingGraph = bindingGraphFactory.create(subcomponentDescriptor, true);
-    boolean isValid = bindingGraphValidator.isValid(fullBindingGraph.topLevelBindingGraph());
+    // In this case, we don't actually care about the return value. The important part here is that
+    // BindingGraphValidator#isValid() runs all of the SPI plugins and reports any errors.
+    // TODO(bcorso): Add a separate API with no return value for this particular case.
+    boolean unusedIsValid = bindingGraphValidator.isValid(fullBindingGraph.topLevelBindingGraph());
   }
 
   private void generateComponent(BindingGraph bindingGraph) {