Skip to content

Commit afb41b5

Browse files
bcorsoDagger Team
authored and
Dagger Team
committed
Rename XTypeCheckProcessingStep to TypeCheckProcessingStep.
The `X` was used when we were in the middle of migrating the old `TypeCheckProcessingStep` to `XTypeCheckProcessingStep`. Now that the migration is done and the old `TypeCheckProcessingStep` has been removed, we can rename `XTypeCheckProcessingStep` back to `TypeCheckProcessingStep` RELNOTES=N/A PiperOrigin-RevId: 391601148
1 parent 5381331 commit afb41b5

13 files changed

+21
-22
lines changed

java/dagger/internal/codegen/AssistedFactoryProcessingStep.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
import dagger.internal.codegen.javapoet.TypeNames;
5959
import dagger.internal.codegen.langmodel.DaggerElements;
6060
import dagger.internal.codegen.langmodel.DaggerTypes;
61+
import dagger.internal.codegen.validation.TypeCheckingProcessingStep;
6162
import dagger.internal.codegen.validation.ValidationReport;
62-
import dagger.internal.codegen.validation.XTypeCheckingProcessingStep;
6363
import java.util.HashSet;
6464
import java.util.Optional;
6565
import java.util.Set;
@@ -75,7 +75,7 @@
7575
import javax.lang.model.type.TypeMirror;
7676

7777
/** An annotation processor for {@link dagger.assisted.AssistedFactory}-annotated types. */
78-
final class AssistedFactoryProcessingStep extends XTypeCheckingProcessingStep<XTypeElement> {
78+
final class AssistedFactoryProcessingStep extends TypeCheckingProcessingStep<XTypeElement> {
7979
private final XProcessingEnv processingEnv;
8080
private final XMessager messager;
8181
private final XFiler filer;

java/dagger/internal/codegen/AssistedInjectProcessingStep.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
import dagger.internal.codegen.binding.AssistedInjectionAnnotations.AssistedParameter;
3232
import dagger.internal.codegen.javapoet.TypeNames;
3333
import dagger.internal.codegen.langmodel.DaggerTypes;
34+
import dagger.internal.codegen.validation.TypeCheckingProcessingStep;
3435
import dagger.internal.codegen.validation.ValidationReport;
35-
import dagger.internal.codegen.validation.XTypeCheckingProcessingStep;
3636
import java.util.HashSet;
3737
import java.util.Set;
3838
import javax.inject.Inject;
@@ -41,7 +41,7 @@
4141
import javax.lang.model.type.DeclaredType;
4242

4343
/** An annotation processor for {@link dagger.assisted.AssistedInject}-annotated elements. */
44-
final class AssistedInjectProcessingStep extends XTypeCheckingProcessingStep<XExecutableElement> {
44+
final class AssistedInjectProcessingStep extends TypeCheckingProcessingStep<XExecutableElement> {
4545
private final DaggerTypes types;
4646
private final XMessager messager;
4747
private final XProcessingEnv processingEnv;

java/dagger/internal/codegen/AssistedProcessingStep.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
import dagger.internal.codegen.javapoet.TypeNames;
3232
import dagger.internal.codegen.kotlin.KotlinMetadataUtil;
3333
import dagger.internal.codegen.langmodel.DaggerElements;
34+
import dagger.internal.codegen.validation.TypeCheckingProcessingStep;
3435
import dagger.internal.codegen.validation.ValidationReport;
35-
import dagger.internal.codegen.validation.XTypeCheckingProcessingStep;
3636
import javax.inject.Inject;
3737
import javax.lang.model.element.Element;
3838
import javax.lang.model.element.ElementKind;
@@ -44,7 +44,7 @@
4444
*
4545
* <p>This processing step should run after {@link AssistedFactoryProcessingStep}.
4646
*/
47-
final class AssistedProcessingStep extends XTypeCheckingProcessingStep<XVariableElement> {
47+
final class AssistedProcessingStep extends TypeCheckingProcessingStep<XVariableElement> {
4848
private final KotlinMetadataUtil kotlinMetadataUtil;
4949
private final InjectionAnnotations injectionAnnotations;
5050
private final DaggerElements elements;

java/dagger/internal/codegen/ComponentHjarProcessingStep.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
import dagger.internal.codegen.binding.ComponentDescriptorFactory;
3434
import dagger.internal.codegen.validation.ComponentCreatorValidator;
3535
import dagger.internal.codegen.validation.ComponentValidator;
36+
import dagger.internal.codegen.validation.TypeCheckingProcessingStep;
3637
import dagger.internal.codegen.validation.ValidationReport;
37-
import dagger.internal.codegen.validation.XTypeCheckingProcessingStep;
3838
import java.util.Set;
3939
import javax.inject.Inject;
4040
import javax.lang.model.element.TypeElement;
@@ -52,7 +52,7 @@
5252
* <p>The components emitted by this processing step include all of the API elements exposed by the
5353
* normal step. Method bodies are omitted as Turbine ignores them entirely.
5454
*/
55-
final class ComponentHjarProcessingStep extends XTypeCheckingProcessingStep<XTypeElement> {
55+
final class ComponentHjarProcessingStep extends TypeCheckingProcessingStep<XTypeElement> {
5656
private final XMessager messager;
5757
private final ComponentValidator componentValidator;
5858
private final ComponentCreatorValidator creatorValidator;

java/dagger/internal/codegen/ComponentProcessingStep.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
import dagger.internal.codegen.validation.ComponentCreatorValidator;
4242
import dagger.internal.codegen.validation.ComponentDescriptorValidator;
4343
import dagger.internal.codegen.validation.ComponentValidator;
44+
import dagger.internal.codegen.validation.TypeCheckingProcessingStep;
4445
import dagger.internal.codegen.validation.ValidationReport;
45-
import dagger.internal.codegen.validation.XTypeCheckingProcessingStep;
4646
import java.util.Set;
4747
import javax.inject.Inject;
4848
import javax.lang.model.element.Element;
@@ -52,7 +52,7 @@
5252
* A {@link ProcessingStep} that is responsible for dealing with a component or production component
5353
* as part of the {@link ComponentProcessor}.
5454
*/
55-
final class ComponentProcessingStep extends XTypeCheckingProcessingStep<XTypeElement> {
55+
final class ComponentProcessingStep extends TypeCheckingProcessingStep<XTypeElement> {
5656
private final XMessager messager;
5757
private final ComponentValidator componentValidator;
5858
private final ComponentCreatorValidator creatorValidator;

java/dagger/internal/codegen/InjectProcessingStep.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.squareup.javapoet.ClassName;
2525
import dagger.internal.codegen.binding.InjectBindingRegistry;
2626
import dagger.internal.codegen.javapoet.TypeNames;
27-
import dagger.internal.codegen.validation.XTypeCheckingProcessingStep;
27+
import dagger.internal.codegen.validation.TypeCheckingProcessingStep;
2828
import java.util.Set;
2929
import javax.inject.Inject;
3030
import javax.lang.model.element.Element;
@@ -38,7 +38,7 @@
3838
* annotation.
3939
*/
4040
// TODO(gak): add some error handling for bad source files
41-
final class InjectProcessingStep extends XTypeCheckingProcessingStep<XElement> {
41+
final class InjectProcessingStep extends TypeCheckingProcessingStep<XElement> {
4242
private final ElementVisitor<Void, Void> visitor;
4343
private final Set<Element> processedElements = Sets.newLinkedHashSet();
4444

java/dagger/internal/codegen/MapKeyProcessingStep.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
import dagger.internal.codegen.javapoet.TypeNames;
3030
import dagger.internal.codegen.langmodel.DaggerTypes;
3131
import dagger.internal.codegen.validation.MapKeyValidator;
32+
import dagger.internal.codegen.validation.TypeCheckingProcessingStep;
3233
import dagger.internal.codegen.validation.ValidationReport;
33-
import dagger.internal.codegen.validation.XTypeCheckingProcessingStep;
3434
import dagger.internal.codegen.writing.AnnotationCreatorGenerator;
3535
import dagger.internal.codegen.writing.UnwrappedMapKeyGenerator;
3636
import javax.inject.Inject;
@@ -42,7 +42,7 @@
4242
* The annotation processor responsible for validating the mapKey annotation and auto-generate
4343
* implementation of annotations marked with {@link MapKey @MapKey} where necessary.
4444
*/
45-
final class MapKeyProcessingStep extends XTypeCheckingProcessingStep<XTypeElement> {
45+
final class MapKeyProcessingStep extends TypeCheckingProcessingStep<XTypeElement> {
4646
private final XMessager messager;
4747
private final DaggerTypes types;
4848
private final MapKeyValidator mapKeyValidator;

java/dagger/internal/codegen/ModuleProcessingStep.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
import dagger.internal.codegen.javapoet.TypeNames;
4141
import dagger.internal.codegen.kotlin.KotlinMetadataUtil;
4242
import dagger.internal.codegen.validation.ModuleValidator;
43+
import dagger.internal.codegen.validation.TypeCheckingProcessingStep;
4344
import dagger.internal.codegen.validation.ValidationReport;
44-
import dagger.internal.codegen.validation.XTypeCheckingProcessingStep;
4545
import dagger.internal.codegen.writing.InaccessibleMapKeyProxyGenerator;
4646
import dagger.internal.codegen.writing.ModuleGenerator;
4747
import java.util.Map;
@@ -54,7 +54,7 @@
5454
* A {@link ProcessingStep} that validates module classes and generates factories for binding
5555
* methods.
5656
*/
57-
final class ModuleProcessingStep extends XTypeCheckingProcessingStep<XTypeElement> {
57+
final class ModuleProcessingStep extends TypeCheckingProcessingStep<XTypeElement> {
5858
private final XMessager messager;
5959
private final ModuleValidator moduleValidator;
6060
private final BindingFactory bindingFactory;

java/dagger/internal/codegen/validation/BindingMethodProcessingStep.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
/** A step that validates all binding methods that were not validated while processing modules. */
3030
public final class BindingMethodProcessingStep
31-
extends XTypeCheckingProcessingStep<XExecutableElement> {
31+
extends TypeCheckingProcessingStep<XExecutableElement> {
3232

3333
private final XMessager messager;
3434
private final AnyBindingMethodValidator anyBindingMethodValidator;

java/dagger/internal/codegen/validation/BindsInstanceProcessingStep.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
* Processing step that validates that the {@code BindsInstance} annotation is applied to the
3131
* correct elements.
3232
*/
33-
public final class BindsInstanceProcessingStep extends XTypeCheckingProcessingStep<XElement> {
33+
public final class BindsInstanceProcessingStep extends TypeCheckingProcessingStep<XElement> {
3434
private final BindsInstanceMethodValidator methodValidator;
3535
private final BindsInstanceParameterValidator parameterValidator;
3636
private final XMessager messager;

java/dagger/internal/codegen/validation/MonitoringModuleProcessingStep.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
* A processing step that is responsible for generating a special module for a {@link
2828
* dagger.producers.ProductionComponent} or {@link dagger.producers.ProductionSubcomponent}.
2929
*/
30-
public final class MonitoringModuleProcessingStep
31-
extends XTypeCheckingProcessingStep<XTypeElement> {
30+
public final class MonitoringModuleProcessingStep extends TypeCheckingProcessingStep<XTypeElement> {
3231
private final XMessager messager;
3332
private final MonitoringModuleGenerator monitoringModuleGenerator;
3433

java/dagger/internal/codegen/validation/MultibindingAnnotationsProcessingStep.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* non-binding methods.
3333
*/
3434
public final class MultibindingAnnotationsProcessingStep
35-
extends XTypeCheckingProcessingStep<XExecutableElement> {
35+
extends TypeCheckingProcessingStep<XExecutableElement> {
3636
private final AnyBindingMethodValidator anyBindingMethodValidator;
3737
private final XMessager messager;
3838

java/dagger/internal/codegen/validation/XTypeCheckingProcessingStep.java java/dagger/internal/codegen/validation/TypeCheckingProcessingStep.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
* A {@link XProcessingStep} that processes one element at a time and defers any for which {@link
3737
* TypeNotPresentException} is thrown.
3838
*/
39-
public abstract class XTypeCheckingProcessingStep<E extends XElement> implements XProcessingStep {
39+
public abstract class TypeCheckingProcessingStep<E extends XElement> implements XProcessingStep {
4040

4141
@Override
4242
public final ImmutableSet<String> annotations() {

0 commit comments

Comments
 (0)