forked from square/dagger
-
Notifications
You must be signed in to change notification settings - Fork 2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add string qualifier to @assisted annotation to disambiguate duplicat…
…e assisted parameter types. Fixes #2281 RELNOTES=Fixes #2281: Force duplicate assisted types to use @assisted("...") to disambiguate. PiperOrigin-RevId: 353061817
- Loading branch information
Showing
10 changed files
with
785 additions
and
97 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
87 changes: 87 additions & 0 deletions
87
java/dagger/internal/codegen/AssistedInjectProcessingStep.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| /* | ||
| * Copyright (C) 2020 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; | ||
|
|
||
| import static com.google.auto.common.MoreTypes.asDeclared; | ||
| import static com.google.common.base.Preconditions.checkState; | ||
| import static dagger.internal.codegen.langmodel.DaggerElements.closestEnclosingTypeElement; | ||
|
|
||
| import com.google.auto.common.MoreElements; | ||
| import com.google.common.collect.ImmutableList; | ||
| import com.google.common.collect.ImmutableSet; | ||
| import dagger.assisted.AssistedInject; | ||
| import dagger.internal.codegen.binding.AssistedInjectionAnnotations; | ||
| import dagger.internal.codegen.binding.AssistedInjectionAnnotations.AssistedParameter; | ||
| import dagger.internal.codegen.langmodel.DaggerTypes; | ||
| import dagger.internal.codegen.validation.TypeCheckingProcessingStep; | ||
| import dagger.internal.codegen.validation.ValidationReport; | ||
| import java.lang.annotation.Annotation; | ||
| import java.util.HashSet; | ||
| import java.util.Set; | ||
| import javax.annotation.processing.Messager; | ||
| import javax.inject.Inject; | ||
| import javax.lang.model.element.ElementKind; | ||
| import javax.lang.model.element.ExecutableElement; | ||
| import javax.lang.model.type.DeclaredType; | ||
|
|
||
| /** An annotation processor for {@link dagger.assisted.AssistedInject}-annotated elements. */ | ||
| final class AssistedInjectProcessingStep extends TypeCheckingProcessingStep<ExecutableElement> { | ||
| private final DaggerTypes types; | ||
| private final Messager messager; | ||
|
|
||
| @Inject | ||
| AssistedInjectProcessingStep(DaggerTypes types, Messager messager) { | ||
| super(MoreElements::asExecutable); | ||
| this.types = types; | ||
| this.messager = messager; | ||
| } | ||
|
|
||
| @Override | ||
| public ImmutableSet<Class<? extends Annotation>> annotations() { | ||
| return ImmutableSet.of(AssistedInject.class); | ||
| } | ||
|
|
||
| @Override | ||
| protected void process( | ||
| ExecutableElement assistedInjectElement, | ||
| ImmutableSet<Class<? extends Annotation>> annotations) { | ||
| new AssistedInjectValidator().validate(assistedInjectElement).printMessagesTo(messager); | ||
| } | ||
|
|
||
| private final class AssistedInjectValidator { | ||
| ValidationReport<ExecutableElement> validate(ExecutableElement constructor) { | ||
| checkState(constructor.getKind() == ElementKind.CONSTRUCTOR); | ||
| ValidationReport.Builder<ExecutableElement> report = ValidationReport.about(constructor); | ||
|
|
||
| DeclaredType assistedInjectType = | ||
| asDeclared(closestEnclosingTypeElement(constructor).asType()); | ||
| ImmutableList<AssistedParameter> assistedParameters = | ||
| AssistedInjectionAnnotations.assistedInjectAssistedParameters(assistedInjectType, types); | ||
|
|
||
| Set<AssistedParameter> uniqueAssistedParameters = new HashSet<>(); | ||
| for (AssistedParameter assistedParameter : assistedParameters) { | ||
| if (!uniqueAssistedParameters.add(assistedParameter)) { | ||
| report.addError( | ||
| "@AssistedInject constructor has duplicate @Assisted type: " + assistedParameter, | ||
| assistedParameter.variableElement()); | ||
| } | ||
| } | ||
|
|
||
| return report.build(); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.