Renaming binding methods

smoothie-sample/src/test/java/com/example/smoothie/SimpleActivityTest.java

@@ -52,7 +52,7 @@ public void verifyInjectionAtOnCreate() {
 
   private class TestModule extends Module {
     public TestModule(ContextNamer mockContextNamer) {
-      bind(ContextNamer.class).to(mockContextNamer);
+      bind(ContextNamer.class).toInstance(mockContextNamer);
     }
   }
 }

smoothie/src/main/java/toothpick/smoothie/module/ActivityModule.java

@@ -11,9 +11,9 @@
 
 public class ActivityModule extends Module {
   public ActivityModule(Activity activity) {
-    bind(Activity.class).to(activity);
-    bind(FragmentManager.class).toProvider(new FragmentManagerProvider(activity));
-    bind(LoaderManager.class).toProvider(new LoaderManagerProvider(activity));
-    bind(LayoutInflater.class).toProvider(new LayoutInflaterProvider(activity));
+    bind(Activity.class).toInstance(activity);
+    bind(FragmentManager.class).toProviderInstance(new FragmentManagerProvider(activity));
+    bind(LoaderManager.class).toProviderInstance(new LoaderManagerProvider(activity));
+    bind(LayoutInflater.class).toProviderInstance(new LayoutInflaterProvider(activity));
   }
 }

smoothie/src/main/java/toothpick/smoothie/module/ApplicationModule.java

@@ -55,14 +55,14 @@
 
 public class ApplicationModule extends Module {
   public ApplicationModule(Application application) {
-    bind(Application.class).to(application);
-    bind(AccountManager.class).toProvider(new AccountManagerProvider(application));
-    bind(AssetManager.class).toProvider(new AssetManagerProvider(application));
-    bind(ContentResolver.class).toProvider(new ContentResolverProvider(application));
-    bind(Handler.class).toProvider(new HandlerProvider());
-    bind(PackageManager.class).toProvider(new PackageManagerProvider(application));
-    bind(Resources.class).toProvider(new ResourcesProvider(application));
-    bind(SharedPreferences.class).toProvider(new SharedPreferencesProvider(application));
+    bind(Application.class).toInstance(application);
+    bind(AccountManager.class).toProviderInstance(new AccountManagerProvider(application));
+    bind(AssetManager.class).toProviderInstance(new AssetManagerProvider(application));
+    bind(ContentResolver.class).toProviderInstance(new ContentResolverProvider(application));
+    bind(Handler.class).toProviderInstance(new HandlerProvider());
+    bind(PackageManager.class).toProviderInstance(new PackageManagerProvider(application));
+    bind(Resources.class).toProviderInstance(new ResourcesProvider(application));
+    bind(SharedPreferences.class).toProviderInstance(new SharedPreferencesProvider(application));
     bindSystemServices(application);
     bindPackageInfo(application);
   }
@@ -71,7 +71,7 @@ private void bindPackageInfo(Application application) {
     final PackageInfo packageInfo;
     try {
       packageInfo = application.getPackageManager().getPackageInfo(application.getPackageName(), 0);
-      bind(PackageInfo.class).to(packageInfo);
+      bind(PackageInfo.class).toInstance(packageInfo);
     } catch (PackageManager.NameNotFoundException e) {
       throw new RuntimeException(e);
     }
@@ -104,6 +104,6 @@ private void bindForGingerBreadAndAbove(Application application) {
   }
 
   private <T> void bindSystemService(Application application, Class<T> serviceClass, String serviceName) {
-    bind(serviceClass).toProvider(new SystemServiceProvider<T>(application, serviceName));
+    bind(serviceClass).toProviderInstance(new SystemServiceProvider<T>(application, serviceName));
   }
 }

smoothie/src/main/java/toothpick/smoothie/module/SupportActivityModule.java

@@ -12,9 +12,9 @@
 
 public class SupportActivityModule extends Module {
   public SupportActivityModule(FragmentActivity activity) {
-    bind(Activity.class).to(activity);
-    bind(FragmentManager.class).toProvider(new SupportFragmentManagerProvider(activity));
-    bind(LoaderManager.class).toProvider(new SupportLoaderManagerProvider(activity));
-    bind(LayoutInflater.class).toProvider(new LayoutInflaterProvider(activity));
+    bind(Activity.class).toInstance(activity);
+    bind(FragmentManager.class).toProviderInstance(new SupportFragmentManagerProvider(activity));
+    bind(LoaderManager.class).toProviderInstance(new SupportLoaderManagerProvider(activity));
+    bind(LayoutInflater.class).toProviderInstance(new LayoutInflaterProvider(activity));
   }
 }

toothpick-runtime/src/test/java/toothpick/AllBindingsTest.java

@@ -80,7 +80,7 @@ public void singletonBinding_shouldCreateNonInjectedSingleton() throws Exception
     Scope scope = new ScopeImpl("");
     scope.installModules(new Module() {
       {
-        bind(Foo.class).to(instance);
+        bind(Foo.class).toInstance(instance);
       }
     });
 
@@ -152,7 +152,7 @@ public void bindToProviderInstance_shouldCreateNonInjectedInstances() throws Exc
     Scope scope = new ScopeImpl("");
     scope.installModules(new Module() {
       {
-        bind(IFoo.class).toProvider(providerInstance);
+        bind(IFoo.class).toProviderInstance(providerInstance);
       }
     });
 

toothpick-runtime/src/test/java/toothpick/ScopeImplTest.java

@@ -114,20 +114,20 @@ public void testToBinding_shouldFail_whenAddingANullBinding() {
 
   private static class TestModule extends Module {
     public TestModule(Foo foo) {
-      bind(Foo.class).to(foo);
+      bind(Foo.class).toInstance(foo);
     }
   }
 
   private static class ProdModule extends Module {
     public ProdModule() {
-      bind(Foo.class).to(new Foo());
+      bind(Foo.class).toInstance(new Foo());
     }
   }
 
   private static class ProdModule2 extends Module {
     public ProdModule2() {
-      bind(Foo.class).to(new Foo());
-      bind(Bar.class).to(new Bar());
+      bind(Foo.class).toInstance(new Foo());
+      bind(Bar.class).toInstance(new Bar());
     }
   }
 

toothpick-runtime/src/test/java/toothpick/ScopingTest.java

@@ -33,15 +33,15 @@ public void childInjector_shouldReturnInstancesInItsScope_whenParentAlsoHasSameK
     ScopeNode scopeParent = new ScopeImpl("");
     scopeParent.installModules(new Module() {
       {
-        bind(Foo.class).to(foo1);
+        bind(Foo.class).toInstance(foo1);
       }
     });
     final Foo foo2 = new Foo();
     ScopeNode scope = new ScopeImpl("");
     scopeParent.addChild(scope);
     scope.installModules(new Module() {
       {
-        bind(Foo.class).to(foo2);
+        bind(Foo.class).toInstance(foo2);
       }
     });
 
@@ -60,7 +60,7 @@ public void childInjector_shouldReturnInstancesInParentScope_whenParentHasKeyInH
     ScopeNode scopeParent = new ScopeImpl("");
     scopeParent.installModules(new Module() {
       {
-        bind(Foo.class).to(foo1);
+        bind(Foo.class).toInstance(foo1);
       }
     });
     ScopeNode scope = new ScopeImpl("");

toothpick-runtime/src/test/java/toothpick/concurrency/threads/InstallBindingThread.java

@@ -25,7 +25,7 @@ public void doRun() {
     scope.installModules(new Module() {
       {
         Class clazz = classCreator.allClasses[random.nextInt(classCreator.allClasses.length)];
-        bind(clazz).to(new Foo());
+        bind(clazz).toInstance(new Foo());
       }
     });
     setIsSuccessful(true);

toothpick-runtime/src/test/java/toothpick/getInstance/NamedInstanceCreation.java

@@ -87,7 +87,7 @@ public void testInstallModule_shouldFail_ifModuleUsesClassAsNameButNotAnAnnotati
     //WHEN
     scope.installModules(new Module() {
       {
-        bind(Foo.class).withName(NotQualifierAnnotationFooName.class).to(namedFooInstance);
+        bind(Foo.class).withName(NotQualifierAnnotationFooName.class).toInstance(namedFooInstance);
       }
     });
 
@@ -97,8 +97,8 @@ public void testInstallModule_shouldFail_ifModuleUsesClassAsNameButNotAnAnnotati
 
   private static class SimpleModule extends Module {
     public SimpleModule() {
-      bind(Foo.class).withName("bar").to(namedFooInstance);
-      bind(Foo.class).withName(FooName.class).to(namedFooInstance);
+      bind(Foo.class).withName("bar").toInstance(namedFooInstance);
+      bind(Foo.class).withName(FooName.class).toInstance(namedFooInstance);
       bind(Foo.class).to(Foo.class);
     }
   }

toothpick-runtime/src/test/java/toothpick/scoping/ScopingTest.java

@@ -38,14 +38,14 @@ public void childInjector_shouldReturnInstancesInItsScope_whenParentAlsoHasSameK
     Scope scopeParent = new ScopeImpl("root");
     scopeParent.installModules(new Module() {
       {
-        bind(Foo.class).to(foo1);
+        bind(Foo.class).toInstance(foo1);
       }
     });
     final Foo foo2 = new Foo();
     Scope scope = Toothpick.openScopes("root", "child");
     scope.installModules(new Module() {
       {
-        bind(Foo.class).to(foo2);
+        bind(Foo.class).toInstance(foo2);
       }
     });
 
@@ -64,7 +64,7 @@ public void childInjector_shouldReturnInstancesInParentScope_whenParentHasKeyInH
     Scope scopeParent = Toothpick.openScope("root");
     scopeParent.installModules(new Module() {
       {
-        bind(Foo.class).to(foo1);
+        bind(Foo.class).toInstance(foo1);
       }
     });
     Scope scope = Toothpick.openScopes("root", "child");

toothpick-sample/src/test/java/toothpick/sample/SimpleEntryPointTest.java

@@ -57,7 +57,7 @@ public void testMultiply() throws Exception {
 
   private class TestModule extends Module {
     public TestModule() {
-      bind(Computer.class).to(mockComputer);
+      bind(Computer.class).toInstance(mockComputer);
     }
   }
 }

toothpick-testing/src/main/java/toothpick/testing/ToothPickTestModule.java

@@ -34,9 +34,9 @@ public void bindAllMocks(Object test) {
       if (mockAnnotation != null) {
         FieldValueProvider mockProvider = new FieldValueProvider(field, test);
         if (injectionName != null) {
-          bind(field.getType()).withName(injectionName).toProvider(mockProvider);
+          bind(field.getType()).withName(injectionName).toProviderInstance(mockProvider);
         } else {
-          bind(field.getType()).toProvider(mockProvider);
+          bind(field.getType()).toProviderInstance(mockProvider);
         }
         mockCount++;
       }

toothpick-testing/src/test/java/toothpick/testing/TestCustomScopeWithNamedBinding.java

@@ -42,7 +42,7 @@ public static class ModuleWithNamedBindings extends Module {
     public EntryPoint instance = new EntryPoint();
 
     public ModuleWithNamedBindings() {
-      bind(EntryPoint.class).withName("Foo").to(instance);
+      bind(EntryPoint.class).withName("Foo").toInstance(instance);
     }
   }
 }

toothpick/src/main/java/toothpick/config/Binding.java

@@ -44,22 +44,22 @@ public BoundState to(Class<? extends T> implClass) {
     return new BoundState();
   }
 
-  public void to(T instance) {
+  public void toInstance(T instance) {
     this.instance = instance;
     mode = Mode.INSTANCE;
   }
 
-  public void toProvider(Provider<? extends T> providerInstance) {
-    this.providerInstance = providerInstance;
-    mode = Mode.PROVIDER_INSTANCE;
-  }
-
   public BoundState toProvider(Class<? extends Provider<? extends T>> providerClass) {
     this.providerClass = providerClass;
     mode = Mode.PROVIDER_CLASS;
     return new BoundState();
   }
 
+  public void toProviderInstance(Provider<? extends T> providerInstance) {
+    this.providerInstance = providerInstance;
+    mode = Mode.PROVIDER_INSTANCE;
+  }
+
   public Mode getMode() {
     return mode;
   }