Support qualifiers with members

Author: SentryMan

inject-test/src/test/java/org/example/coffee/qualifier/BlueStore.java

@@ -1,9 +1,11 @@
 package org.example.coffee.qualifier;
 
+import org.example.coffee.qualifier.ColorStore.Color;
+
 import jakarta.inject.Singleton;
 
-@Blue
 @Singleton
+@ColorStore(Color.BLUE)
 public class BlueStore implements SomeStore {
 
   @Override

inject-test/src/test/java/org/example/coffee/qualifier/Blue.java renamed to inject-test/src/test/java/org/example/coffee/qualifier/ColorStore.java

@@ -7,5 +7,11 @@
 
 @Qualifier
 @Retention(RUNTIME)
-public @interface Blue {
+public @interface ColorStore {
+  Color value();
+
+  enum Color {
+    BLUE,
+    GREEN
+  }
 }

inject-test/src/test/java/org/example/coffee/qualifier/StoreManagerWithFieldQualifier.java

@@ -1,13 +1,15 @@
 package org.example.coffee.qualifier;
 
+import org.example.coffee.qualifier.ColorStore.Color;
+
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 
 @Singleton
 public class StoreManagerWithFieldQualifier {
 
   @Inject
-  @Blue
+  @ColorStore(Color.BLUE)
   SomeStore store;
 
   public String store() {

inject-test/src/test/java/org/example/coffee/qualifier/StoreManagerWithNamed.java

@@ -8,7 +8,7 @@ public class StoreManagerWithNamed {
 
   private final SomeStore store;
 
-  public StoreManagerWithNamed(@Named("Blue") SomeStore store) {
+  public StoreManagerWithNamed(@Named("ColorStore(Blue)") SomeStore store) {
     this.store = store;
   }
 

inject-test/src/test/java/org/example/coffee/qualifier/StoreManagerWithNamedTest.java

@@ -18,12 +18,12 @@ void test() {
       assertThat(store).isEqualTo("blue");
 
       SomeStore greenStore = beanScope.get(SomeStore.class, "green");
-      SomeStore blueStore = beanScope.get(SomeStore.class, "blue");
+      SomeStore blueStore = beanScope.get(SomeStore.class, "colorStore(blue)");
       Map<String, SomeStore> stores = beanScope.map(SomeStore.class);
 
       SomeStore green = stores.get("green");
       assertThat(green).isSameAs(greenStore);
-      SomeStore blue = stores.get("blue");
+      SomeStore blue = stores.get("colorstore(blue)");
       assertThat(blue).isSameAs(blueStore);
 
       // a map with unnamed component

inject-test/src/test/java/org/example/coffee/qualifier/StoreManagerWithQualifier.java

@@ -1,13 +1,15 @@
 package org.example.coffee.qualifier;
 
+import org.example.coffee.qualifier.ColorStore.Color;
+
 import jakarta.inject.Singleton;
 
 @Singleton
 public class StoreManagerWithQualifier {
 
   private final SomeStore store;
 
-  public StoreManagerWithQualifier(@Blue SomeStore store) {
+  public StoreManagerWithQualifier(@ColorStore(Color.BLUE) SomeStore store) {
     this.store = store;
   }
 

inject-test/src/test/java/org/example/coffee/qualifier/StoreManagerWithSetterQualifier.java

@@ -1,5 +1,7 @@
 package org.example.coffee.qualifier;
 
+import org.example.coffee.qualifier.ColorStore.Color;
+
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 
@@ -9,7 +11,7 @@ public class StoreManagerWithSetterQualifier {
   private final SomeStore blueStore;
   private SomeStore greenStore;
 
-  public StoreManagerWithSetterQualifier(@Blue SomeStore blueStore) {
+  public StoreManagerWithSetterQualifier(@ColorStore(Color.BLUE) SomeStore blueStore) {
     this.blueStore = blueStore;
   }
 

inject-test/src/test/java/org/example/coffee/qualifier/StoreManagerWithSetterQualifierTest.java

@@ -19,7 +19,7 @@ void redStore() {
   @Test
   void namedTestDouble() {
     try (BeanScope context = BeanScope.builder()
-      .bean("Blue", SomeStore.class, () -> "TD Blue")
+      .bean("ColorStore(Blue)", SomeStore.class, () -> "TD Blue")
       .bean("Green", SomeStore.class, () -> "TD Green")
       .build()) {
 
@@ -32,7 +32,7 @@ void namedTestDouble() {
   @Test
   void namedTestDouble_expect_otherNamedStillWired() {
     try (BeanScope context = BeanScope.builder()
-      .bean("Blue", SomeStore.class, () -> "TD Blue Only")
+      .bean("ColorStore(Blue)", SomeStore.class, () -> "TD Blue Only")
       // with GreenStore still wired
       .build()) {
 

inject-test/src/test/java/org/example/injectextension/WithExtnNamedMocksTest.java

@@ -4,9 +4,10 @@
 import io.avaje.inject.test.InjectExtension;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
-import org.example.coffee.qualifier.Blue;
+import org.example.coffee.qualifier.ColorStore;
 import org.example.coffee.qualifier.SomeStore;
 import org.example.coffee.qualifier.StoreManagerWithSetterQualifier;
+import org.example.coffee.qualifier.ColorStore.Color;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
@@ -17,7 +18,9 @@
 @ExtendWith(InjectExtension.class)
 class WithExtnNamedMocksTest {
 
-  @Mock @Blue SomeStore blueStore;
+  @Mock
+  @ColorStore(Color.BLUE)
+  SomeStore blueStore;
 
   @Mock @Named("green") SomeStore greenStore;
 

inject-test/src/test/java/org/example/injectextension/WithExtnNamedSpyTest.java

@@ -4,9 +4,10 @@
 import io.avaje.inject.test.InjectExtension;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
-import org.example.coffee.qualifier.Blue;
+import org.example.coffee.qualifier.ColorStore;
 import org.example.coffee.qualifier.SomeStore;
 import org.example.coffee.qualifier.StoreManagerWithSetterQualifier;
+import org.example.coffee.qualifier.ColorStore.Color;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Spy;
@@ -17,7 +18,8 @@
 @ExtendWith(InjectExtension.class)
 class WithExtnNamedSpyTest {
 
-  @Spy @Blue
+  @Spy
+  @ColorStore(Color.BLUE)
   SomeStore blueStore;
 
   @Spy @Named("green")