fix qualifier issue

Author: stephanenicolas

toothpick-runtime/src/test/java/toothpick/data/FooQualifier.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2016 Stephane Nicolas
+ * Copyright 2016 Daniel Molinero Reguerra
+ *
+ * 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 toothpick.data;
+
+import javax.inject.Qualifier;
+
+@Qualifier
+public @interface FooQualifier {
+  @Qualifier
+  public @interface InnerFooQualifier {}
+}

toothpick-runtime/src/test/java/toothpick/data/FooWithInnerQualifiedLazy.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2016 Stephane Nicolas
+ * Copyright 2016 Daniel Molinero Reguerra
+ *
+ * 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 toothpick.data;
+
+import javax.inject.Inject;
+import toothpick.Lazy;
+
+public class FooWithInnerQualifiedLazy implements IFoo {
+  @Inject @FooQualifier.InnerFooQualifier
+  public Lazy<Bar> bar; // annotation is not needed, but it's a better example
+
+  public FooWithInnerQualifiedLazy() {}
+}

toothpick-runtime/src/test/java/toothpick/data/FooWithQualifiedLazy.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2016 Stephane Nicolas
+ * Copyright 2016 Daniel Molinero Reguerra
+ *
+ * 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 toothpick.data;
+
+import javax.inject.Inject;
+import toothpick.Lazy;
+
+public class FooWithQualifiedLazy implements IFoo {
+  @Inject @FooQualifier public Lazy<Bar> bar; // annotation is not needed, but it's a better example
+
+  public FooWithQualifiedLazy() {}
+}

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

@@ -45,7 +45,7 @@ public void testNamedInjection_shouldNotBeConfusedWithUnNamedInjection_whenUsing
     //WHEN
     Foo instance = scope.getInstance(Foo.class, "bar");
     Foo instance2 = scope.getInstance(Foo.class, "bar");
-    Foo instance3 = scope.getInstance(Foo.class, FooName.class.getName());
+    Foo instance3 = scope.getInstance(Foo.class, FooName.class.getCanonicalName());
     Foo instance4 = scope.getInstance(Foo.class);
 
     //THEN
@@ -67,7 +67,7 @@ public void testNamedProviderInjection_shouldNotBeConfusedWithUnNamedInjection()
     //WHEN
     Provider<Foo> provider = scope.getProvider(Foo.class, "bar");
     Provider<Foo> provider2 = scope.getProvider(Foo.class, "bar");
-    Provider<Foo> provider3 = scope.getProvider(Foo.class, FooName.class.getName());
+    Provider<Foo> provider3 = scope.getProvider(Foo.class, FooName.class.getCanonicalName());
     Provider<Foo> provider4 = scope.getProvider(Foo.class);
 
     //THEN

toothpick-runtime/src/test/java/toothpick/inject/lazy/InjectionOfLazyProviderTest.java

@@ -7,8 +7,11 @@
 import toothpick.Toothpick;
 import toothpick.config.Module;
 import toothpick.data.Bar;
+import toothpick.data.FooQualifier;
+import toothpick.data.FooWithInnerQualifiedLazy;
 import toothpick.data.FooWithLazy;
 import toothpick.data.FooWithNamedLazy;
+import toothpick.data.FooWithQualifiedLazy;
 
 import static org.hamcrest.CoreMatchers.isA;
 import static org.hamcrest.CoreMatchers.notNullValue;
@@ -63,6 +66,56 @@ public void testNamedInjection() throws Exception {
     assertThat(bar2, sameInstance(bar1));
   }
 
+  @Test
+  public void testQualifiedInjection() throws Exception {
+    // GIVEN
+    Scope scope = new ScopeImpl("");
+    scope.installModules(
+        new Module() {
+          {
+            bind(Bar.class).withName(FooQualifier.class).to(Bar.class);
+          }
+        });
+    FooWithQualifiedLazy fooWithLazy = new FooWithQualifiedLazy();
+
+    // WHEN
+    Toothpick.inject(fooWithLazy, scope);
+
+    // THEN
+    assertThat(fooWithLazy.bar, notNullValue());
+    assertThat(fooWithLazy.bar, isA(Lazy.class));
+    Bar bar1 = fooWithLazy.bar.get();
+    assertThat(bar1, isA(Bar.class));
+    Bar bar2 = fooWithLazy.bar.get();
+    assertThat(bar2, isA(Bar.class));
+    assertThat(bar2, sameInstance(bar1));
+  }
+
+  @Test
+  public void testInnerQualifiedInjection() throws Exception {
+    // GIVEN
+    Scope scope = new ScopeImpl("");
+    scope.installModules(
+        new Module() {
+          {
+            bind(Bar.class).withName(FooQualifier.InnerFooQualifier.class).to(Bar.class);
+          }
+        });
+    FooWithInnerQualifiedLazy fooWithLazy = new FooWithInnerQualifiedLazy();
+
+    // WHEN
+    Toothpick.inject(fooWithLazy, scope);
+
+    // THEN
+    assertThat(fooWithLazy.bar, notNullValue());
+    assertThat(fooWithLazy.bar, isA(Lazy.class));
+    Bar bar1 = fooWithLazy.bar.get();
+    assertThat(bar1, isA(Bar.class));
+    Bar bar2 = fooWithLazy.bar.get();
+    assertThat(bar2, isA(Bar.class));
+    assertThat(bar2, sameInstance(bar1));
+  }
+
   @Test(expected = IllegalStateException.class)
   public void testLazyAfterClosingScope() throws Exception {
     //GIVEN

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

@@ -32,7 +32,7 @@ public <A extends Annotation> Binding<T> withName(Class<A> annotationClassWithQu
           String.format("Only qualifier annotation annotations can be used to define a binding name. Add @Qualifier to %s",
               annotationClassWithQualifierAnnotation));
     }
-    this.name = annotationClassWithQualifierAnnotation.getName();
+    this.name = annotationClassWithQualifierAnnotation.getCanonicalName();
     return this;
   }