diff options
| author | Aurimas Liutikas <aurimas@google.com> | 2021-05-12 22:53:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-12 22:53:00 +0000 |
| commit | 8630738d0a775a2f8e5bc09c437556bd75d8b620 (patch) | |
| tree | 6f59a75348d07612173246ac6c4fca04bde0df2c /java/dagger/internal/codegen/binding/AssistedInjectionAnnotations.java | |
| parent | 0cd6a8551365e02a1687415356215ba2061739cd (diff) | |
| parent | 5480a6c05f0c4727b3dd154709f40fdae8d8b4a2 (diff) | |
| download | dagger2-8630738d0a775a2f8e5bc09c437556bd75d8b620.tar.gz | |
Merge "Revert "Merge commit 'upstream/dagger-2.35.1^'"" am: 5882ce8935 am: 5480a6c05f
Original change: https://android-review.googlesource.com/c/platform/external/dagger2/+/1705751
Change-Id: I2f7a4d61b9f48965273925620a8dc0afc43c9bef
Diffstat (limited to 'java/dagger/internal/codegen/binding/AssistedInjectionAnnotations.java')
| -rw-r--r-- | java/dagger/internal/codegen/binding/AssistedInjectionAnnotations.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/java/dagger/internal/codegen/binding/AssistedInjectionAnnotations.java b/java/dagger/internal/codegen/binding/AssistedInjectionAnnotations.java index f9929aef6..8d6ee5df6 100644 --- a/java/dagger/internal/codegen/binding/AssistedInjectionAnnotations.java +++ b/java/dagger/internal/codegen/binding/AssistedInjectionAnnotations.java @@ -59,14 +59,14 @@ import javax.lang.model.type.TypeMirror; public final class AssistedInjectionAnnotations { /** Returns the factory method for the given factory {@link TypeElement}. */ public static ExecutableElement assistedFactoryMethod( - TypeElement factory, DaggerElements elements) { - return getOnlyElement(assistedFactoryMethods(factory, elements)); + TypeElement factory, DaggerElements elements, DaggerTypes types) { + return getOnlyElement(assistedFactoryMethods(factory, elements, types)); } /** Returns the list of abstract factory methods for the given factory {@link TypeElement}. */ public static ImmutableSet<ExecutableElement> assistedFactoryMethods( - TypeElement factory, DaggerElements elements) { - return elements.getLocalAndInheritedMethods(factory).stream() + TypeElement factory, DaggerElements elements, DaggerTypes types) { + return MoreElements.getLocalAndInheritedMethods(factory, types, elements).stream() .filter(method -> method.getModifiers().contains(ABSTRACT)) .filter(method -> !method.isDefault()) .collect(toImmutableSet()); @@ -170,7 +170,7 @@ public final class AssistedInjectionAnnotations { TypeMirror factory, DaggerElements elements, DaggerTypes types) { DeclaredType factoryType = asDeclared(factory); TypeElement factoryElement = asTypeElement(factoryType); - ExecutableElement factoryMethod = assistedFactoryMethod(factoryElement, elements); + ExecutableElement factoryMethod = assistedFactoryMethod(factoryElement, elements, types); ExecutableType factoryMethodType = asExecutable(types.asMemberOf(factoryType, factoryMethod)); DeclaredType assistedInjectType = asDeclared(factoryMethodType.getReturnType()); return new AutoValue_AssistedInjectionAnnotations_AssistedFactoryMetadata( |