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/componentgenerator/ComponentCreatorImplementationFactory.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/componentgenerator/ComponentCreatorImplementationFactory.java')
| -rw-r--r-- | java/dagger/internal/codegen/componentgenerator/ComponentCreatorImplementationFactory.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/dagger/internal/codegen/componentgenerator/ComponentCreatorImplementationFactory.java b/java/dagger/internal/codegen/componentgenerator/ComponentCreatorImplementationFactory.java index 66270c697..e1b35daf9 100644 --- a/java/dagger/internal/codegen/componentgenerator/ComponentCreatorImplementationFactory.java +++ b/java/dagger/internal/codegen/componentgenerator/ComponentCreatorImplementationFactory.java @@ -237,7 +237,7 @@ final class ComponentCreatorImplementationFactory { method.addStatement( "this.$N = $L", fields.get(requirement), - requirement.nullPolicy(elements, metadataUtil).equals(NullPolicy.ALLOW) + requirement.nullPolicy(elements, types, metadataUtil).equals(NullPolicy.ALLOW) ? CodeBlock.of("$N", parameter) : CodeBlock.of("$T.checkNotNull($N)", Preconditions.class, parameter)); return maybeReturnThis(method); @@ -310,7 +310,7 @@ final class ComponentCreatorImplementationFactory { private void addNullHandlingForField( ComponentRequirement requirement, FieldSpec field, MethodSpec.Builder factoryMethod) { - switch (requirement.nullPolicy(elements, metadataUtil)) { + switch (requirement.nullPolicy(elements, types, metadataUtil)) { case NEW: checkState(requirement.kind().isModule()); factoryMethod @@ -334,7 +334,7 @@ final class ComponentCreatorImplementationFactory { private void addNullHandlingForParameter( ComponentRequirement requirement, String parameter, MethodSpec.Builder factoryMethod) { - if (!requirement.nullPolicy(elements, metadataUtil).equals(NullPolicy.ALLOW)) { + if (!requirement.nullPolicy(elements, types, metadataUtil).equals(NullPolicy.ALLOW)) { // Factory method parameters are always required unless they are a nullable // binds-instance (i.e. ALLOW) factoryMethod.addStatement("$T.checkNotNull($L)", Preconditions.class, parameter); |