Skip to content

Commit

Permalink
Add DependencyRequest.Builder; clarify a parameter to DelegateDeclara…
Browse files Browse the repository at this point in the history 
…tion.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=127993326
  • Loading branch information
@ronshapiro @cgruber
ronshapiro authored and cgruber committed Jul 25, 2016
1 parent 8b0c281 commit 4938083
Show file tree
Hide file tree
Showing 2 changed files with 75 additions and 54 deletions.
8 changes: 4 additions & 4 deletions compiler/src/main/java/dagger/internal/codegen/DelegateDeclaration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,20 +57,20 @@ static final class Factory {
}

DelegateDeclaration create(
ExecutableElement bindsMethod, TypeElement contributingElement) {
ExecutableElement bindsMethod, TypeElement contributingModule) {
checkArgument(MoreElements.isAnnotationPresent(bindsMethod, Binds.class));
ExecutableType resolvedMethod =
MoreTypes.asExecutable(
types.asMemberOf(MoreTypes.asDeclared(contributingElement.asType()), bindsMethod));
types.asMemberOf(MoreTypes.asDeclared(contributingModule.asType()), bindsMethod));
DependencyRequest delegateRequest =
dependencyRequestFactory.forRequiredResolvedVariable(
Iterables.getOnlyElement(bindsMethod.getParameters()),
Iterables.getOnlyElement(resolvedMethod.getParameterTypes()));
return new AutoValue_DelegateDeclaration(
ContributionType.fromBindingMethod(bindsMethod),
keyFactory.forBindsMethod(bindsMethod, contributingElement),
keyFactory.forBindsMethod(bindsMethod, contributingModule),
Optional.<Element>of(bindsMethod),
Optional.of(contributingElement),
Optional.of(contributingModule),
delegateRequest,
wrapOptionalInEquivalence(getMapKey(bindsMethod)));
}
Expand Down
121 changes: 71 additions & 50 deletions compiler/src/main/java/dagger/internal/codegen/DependencyRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import dagger.Lazy;
import dagger.MembersInjector;
import dagger.Provides;
Expand All @@ -41,6 +42,7 @@
import dagger.producers.Producer;
import dagger.producers.internal.AbstractProducer;
import java.util.List;
import javax.annotation.CheckReturnValue;
import javax.inject.Inject;
import javax.inject.Provider;
import javax.lang.model.element.AnnotationMirror;
Expand Down Expand Up @@ -173,6 +175,35 @@ public boolean apply(DependencyRequest request) {
}
};

private static DependencyRequest.Builder builder() {
return new AutoValue_DependencyRequest.Builder()
.isNullable(false)
.isSynthetic(false);
}

@CanIgnoreReturnValue
@AutoValue.Builder
abstract static class Builder {
abstract Builder kind(Kind kind);

abstract Builder key(Key key);

abstract Builder requestElement(Element element);

abstract Builder isNullable(boolean isNullable);

abstract Builder overriddenVariableName(Optional<String> overriddenVariableName);

abstract Builder isSynthetic(boolean isSynthetic);

Builder isSynthetic() {
return isSynthetic(true);
}

@CheckReturnValue
abstract DependencyRequest build();
}

/**
* Factory for {@link DependencyRequest}s.
*
Expand Down Expand Up @@ -209,13 +240,12 @@ ImmutableSet<DependencyRequest> forRequiredResolvedVariables(
DependencyRequest forImplicitMapBinding(
DependencyRequest mapOfValueRequest, Key mapOfFactoryKey) {
checkNotNull(mapOfValueRequest);
return new AutoValue_DependencyRequest(
Kind.PROVIDER,
mapOfFactoryKey,
mapOfValueRequest.requestElement(),
false /* doesn't allow null */,
Optional.<String>absent(),
true /* synthetic */);
return DependencyRequest.builder()
.kind(Kind.PROVIDER)
.key(mapOfFactoryKey)
.requestElement(mapOfValueRequest.requestElement())
.isSynthetic()
.build();
}

/**
Expand All @@ -228,13 +258,12 @@ DependencyRequest forMultibindingContribution(
multibindingContribution.key().multibindingContributionIdentifier().isPresent(),
"multibindingContribution's key must have a multibinding contribution identifier: %s",
multibindingContribution);
return new AutoValue_DependencyRequest(
multibindingContributionRequestKind(multibindingContribution),
multibindingContribution.key(),
request.requestElement(),
false /* doesn't allow null */,
Optional.<String>absent(),
true /* synthetic */);
return DependencyRequest.builder()
.kind(multibindingContributionRequestKind(multibindingContribution))
.key(multibindingContribution.key())
.requestElement(request.requestElement())
.isSynthetic()
.build();
}

private Kind multibindingContributionRequestKind(ContributionBinding multibindingContribution) {
Expand Down Expand Up @@ -314,14 +343,12 @@ DependencyRequest forComponentProductionMethod(ExecutableElement productionMetho
// Only a component production method can be a request for a ListenableFuture, so we
// special-case it here.
if (isTypeOf(ListenableFuture.class, type)) {
return new AutoValue_DependencyRequest(
Kind.FUTURE,
keyFactory.forQualifiedType(
qualifier, Iterables.getOnlyElement(((DeclaredType) type).getTypeArguments())),
productionMethod,
false /* doesn't allow null */,
Optional.<String>absent(),
false /* not synthetic */);
return DependencyRequest.builder()
.kind(Kind.FUTURE)
.key(keyFactory.forQualifiedType(
qualifier, Iterables.getOnlyElement(((DeclaredType) type).getTypeArguments())))
.requestElement(productionMethod)
.build();
} else {
return newDependencyRequest(productionMethod, type, qualifier, Optional.<String>absent());
}
Expand All @@ -339,34 +366,28 @@ DependencyRequest forComponentMembersInjectionMethod(ExecutableElement membersIn
MoreTypes.isType(returnType) && MoreTypes.isTypeOf(MembersInjector.class, returnType)
? getOnlyElement(MoreTypes.asDeclared(returnType).getTypeArguments())
: getOnlyElement(membersInjectionMethodType.getParameterTypes());
return new AutoValue_DependencyRequest(
Kind.MEMBERS_INJECTOR,
keyFactory.forMembersInjectedType(membersInjectedType),
membersInjectionMethod,
false /* doesn't allow null */,
Optional.<String>absent(),
false /* not synthetic */);
return DependencyRequest.builder()
.kind(Kind.MEMBERS_INJECTOR)
.key(keyFactory.forMembersInjectedType(membersInjectedType))
.requestElement(membersInjectionMethod)
.build();
}

DependencyRequest forMembersInjectedType(DeclaredType type) {
return new AutoValue_DependencyRequest(
Kind.MEMBERS_INJECTOR,
keyFactory.forMembersInjectedType(type),
type.asElement(),
false /* doesn't allow null */,
Optional.<String>absent(),
false /* not synthetic */);
return DependencyRequest.builder()
.kind(Kind.MEMBERS_INJECTOR)
.key(keyFactory.forMembersInjectedType(type))
.requestElement(type.asElement())
.build();
}

DependencyRequest forProductionImplementationExecutor() {
Key key = keyFactory.forProductionImplementationExecutor();
return new AutoValue_DependencyRequest(
Kind.PROVIDER,
key,
MoreTypes.asElement(key.type()),
false /* doesn't allow null */,
Optional.<String>absent(),
false /* not synthetic */);
return DependencyRequest.builder()
.kind(Kind.PROVIDER)
.key(key)
.requestElement(MoreTypes.asElement(key.type()))
.build();
}

DependencyRequest forProductionComponentMonitorProvider() {
Expand Down Expand Up @@ -394,13 +415,13 @@ private DependencyRequest newDependencyRequest(
// TODO(sameb): should Produced/Producer always require non-nullable?
boolean allowsNull = !kindAndType.kind().equals(Kind.INSTANCE)
|| ConfigurationAnnotations.getNullableType(requestElement).isPresent();
return new AutoValue_DependencyRequest(
kindAndType.kind(),
keyFactory.forQualifiedType(qualifier, kindAndType.type()),
requestElement,
allowsNull,
name,
false /* not synthetic */);
return DependencyRequest.builder()
.kind(kindAndType.kind())
.key(keyFactory.forQualifiedType(qualifier, kindAndType.type()))
.requestElement(requestElement)
.isNullable(allowsNull)
.overriddenVariableName(name)
.build();
}

@AutoValue
Expand Down

0 comments on commit 4938083

Please sign in to comment.