commit 0c4cddf3d0dfd17b85732a4bb00d3edc63dee2de
author ronshapiro <ronshapiro@google.com> Thu Jan 04 15:28:51 2018 -0800
committer Ron Shapiro <shapiro.rd@gmail.com> Mon Jan 08 16:11:32 2018 -0500
tree 43332323d4d7de0160a2e43539919d147bcdb5cf
parent ed0d852e86ca96a9f4d4e4891f2dfeccb3d21fda

Add a Binding type to the dagger.model package

Also move ContributionBinding.Kind to dagger.model.BindingKind

RELNOTES=n/a

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=180854144

java/dagger/internal/codegen/SourceFiles.java

diff --git a/java/dagger/internal/codegen/SourceFiles.java b/java/dagger/internal/codegen/SourceFiles.java
index 9e27003..782a872 100644
--- a/java/dagger/internal/codegen/SourceFiles.java
+++ b/java/dagger/internal/codegen/SourceFiles.java
@@ -21,9 +21,6 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Verify.verify;
-import static dagger.internal.codegen.ContributionBinding.Kind.INJECTION;
-import static dagger.internal.codegen.ContributionBinding.Kind.SYNTHETIC_MULTIBOUND_MAP;
-import static dagger.internal.codegen.ContributionBinding.Kind.SYNTHETIC_MULTIBOUND_SET;
 import static dagger.internal.codegen.DaggerStreams.toImmutableList;
 import static dagger.internal.codegen.DaggerStreams.toImmutableSet;
 import static dagger.internal.codegen.Optionals.optionalComparator;
@@ -37,6 +34,9 @@
 import static dagger.internal.codegen.TypeNames.SET_FACTORY;
 import static dagger.internal.codegen.TypeNames.SET_OF_PRODUCED_PRODUCER;
 import static dagger.internal.codegen.TypeNames.SET_PRODUCER;
+import static dagger.model.BindingKind.INJECTION;
+import static dagger.model.BindingKind.MULTIBOUND_MAP;
+import static dagger.model.BindingKind.MULTIBOUND_SET;
 import static java.util.Comparator.comparing;
 import static javax.lang.model.SourceVersion.isName;
 
@@ -189,7 +189,7 @@
         ContributionBinding contribution = (ContributionBinding) binding;
         checkArgument(contribution.bindingTypeElement().isPresent());
         ClassName enclosingClassName = ClassName.get(contribution.bindingTypeElement().get());
-        switch (contribution.bindingKind()) {
+        switch (contribution.kind()) {
           case INJECTION:
           case PROVISION:
           case PRODUCTION:
@@ -256,7 +256,7 @@
    * </ul>
    */
   static ClassName setFactoryClassName(ContributionBinding binding) {
-    checkArgument(binding.bindingKind().equals(SYNTHETIC_MULTIBOUND_SET));
+    checkArgument(binding.kind().equals(MULTIBOUND_SET));
     if (binding.bindingType().equals(BindingType.PROVISION)) {
       return SET_FACTORY;
     } else {
@@ -267,7 +267,7 @@
 
   /** The {@link java.util.Map} factory class name appropriate for map bindings. */
   static ClassName mapFactoryClassName(ContributionBinding binding) {
-    checkState(binding.bindingKind().equals(SYNTHETIC_MULTIBOUND_MAP), binding.bindingKind());
+    checkState(binding.kind().equals(MULTIBOUND_MAP), binding.kind());
     MapType mapType = MapType.from(binding.key());
     switch (binding.bindingType()) {
       case PROVISION:
@@ -284,7 +284,7 @@
   }
 
   private static String factoryPrefix(ContributionBinding binding) {
-    switch (binding.bindingKind()) {
+    switch (binding.kind()) {
       case INJECTION:
         return "";
 
@@ -301,7 +301,7 @@
   static ImmutableList<TypeVariableName> bindingTypeElementTypeVariableNames(Binding binding) {
     if (binding instanceof ContributionBinding) {
       ContributionBinding contributionBinding = (ContributionBinding) binding;
-      if (!contributionBinding.bindingKind().equals(INJECTION)
+      if (!contributionBinding.kind().equals(INJECTION)
           && !contributionBinding.requiresModuleInstance()) {
         return ImmutableList.of();
       }