no longer strip @ from qualifiers

Author: SentryMan

inject-generator/src/main/java/io/avaje/inject/generator/AnnotationCopier.java

@@ -38,7 +38,7 @@ public static void copyAnnotations(
   }
 
   static String getSimpleAnnotationString(AnnotationMirror annotationMirror) {
-    return Util.trimAnnotationString(getAnnotationString("", annotationMirror, true)).substring(1);
+    return Util.trimAnnotationString(getAnnotationString("", annotationMirror, true));
   }
 
   static String getAnnotationString(

inject-test/src/main/java/io/avaje/inject/test/MetaReader.java

@@ -124,7 +124,7 @@ private String name(Field field) {
         if (metaAnnotation.annotationType().equals(Qualifier.class)) {
           return AnnotationReader.simplifyAnnotation(annotation.toString())
               .replaceFirst(annotationType.getCanonicalName(), annotationType.getSimpleName())
-              .replace("()", "").substring(1)
+              .replace("()", "")
               .toLowerCase();
         }
       }

inject-test/src/test/java/org/example/coffee/INeedBeanScope.java

@@ -17,6 +17,6 @@ class INeedBeanScope {
   }
 
   Que getQueue() {
-    return beanScope.get(Que.class, "frodo");
+    return beanScope.get(Que.class, "@frodo");
   }
 }

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("@Blue") SomeStore store) {
     this.store = store;
   }
 

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

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

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

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

inject-test/src/test/java/org/example/coffee/qualifier/members/SpyMeterTest.java

@@ -15,9 +15,9 @@
 class SpyMeterTest {
 
   private static final String METRIC =
-      "TempQualifier(defaultVal=0, inject={@NestedAnnotation(inject={})}, someOtherString=\"celsi\", value={CELSIUS})";
+      "@TempQualifier(defaultVal=0, inject={@NestedAnnotation(inject={})}, someOtherString=\"celsi\", value={CELSIUS})";
   private static final String IMPERIAL =
-      "TempQualifier(defaultVal=0, inject={@NestedAnnotation(inject={})}, someOtherString=\"far\", value={FAHRENHEIT})";
+      "@TempQualifier(defaultVal=0, inject={@NestedAnnotation(inject={})}, someOtherString=\"far\", value={FAHRENHEIT})";
 
   @Spy
   @TempQualifier(value = Scale.FAHRENHEIT, someOtherString = "far")

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

@@ -19,7 +19,7 @@ class WithExtnNamedMocksTest {
 
   @Mock @Blue SomeStore blueStore;
 
-  @Mock @Named("green") SomeStore greenStore;
+  @Mock @Named("@green") SomeStore greenStore;
 
   @Inject StoreManagerWithSetterQualifier storeManager;
 
@@ -39,12 +39,12 @@ void test() {
 
       try (BeanScope beanScope = BeanScope.builder()
         .forTesting()
-        .mock(SomeStore.class, "Blue")
-        .mock(SomeStore.class, "green")
+        .mock(SomeStore.class, "@Blue")
+        .mock(SomeStore.class, "@green")
         .build()) {
 
-        final SomeStore greenStore = beanScope.get(SomeStore.class, "green");
-        final SomeStore blueStore = beanScope.get(SomeStore.class, "blue");
+        final SomeStore greenStore = beanScope.get(SomeStore.class, "@green");
+        final SomeStore blueStore = beanScope.get(SomeStore.class, "@blue");
         when(blueStore.store()).thenReturn("BlueStoreStub");
         when(greenStore.store()).thenReturn("GreenStoreStub");
 

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

@@ -20,7 +20,7 @@ class WithExtnNamedSpyTest {
   @Spy @Blue
   SomeStore blueStore;
 
-  @Spy @Named("green")
+  @Spy @Named("@green")
   SomeStore greenStore;
 
   @Inject
@@ -43,8 +43,8 @@ void test() {
 
       try (BeanScope beanScope = BeanScope.builder()
         .forTesting()
-        .spy(SomeStore.class, "blue")
-        .spy(SomeStore.class, "Green")
+        .spy(SomeStore.class, "@blue")
+        .spy(SomeStore.class, "@Green")
         .build()) {
 
         final StoreManagerWithSetterQualifier storeManager = beanScope.get(StoreManagerWithSetterQualifier.class);

inject-test/src/test/java/org/example/optional/AllQue.java

@@ -15,7 +15,7 @@ public class AllQue {
   private final Optional<Que> sam;
   private final Optional<Que> bilbo;
 
-  AllQue(@Named("frodo") Optional<Que> frodo, @Named("sam") Optional<Que> sam, @Named("bilbo") Optional<Que> bilbo) {
+  AllQue(@Named("@Frodo") Optional<Que> frodo, @Named("sam") Optional<Que> sam, @Named("bilbo") Optional<Que> bilbo) {
     this.frodo = frodo;
     this.sam = sam;
     this.bilbo = bilbo;

inject-test/src/test/java/org/example/optional/AllQue2.java

@@ -12,7 +12,7 @@
 @Singleton
 public class AllQue2 {
 
-  @Inject @Named("frodo") Que frodo;
+  @Inject @Named("@Frodo") Que frodo;
   @Inject @Named("sam") Optional<Que> sam;
   @Inject @Named("bilbo") Optional<Que> bilbo;
 

inject-test/src/test/java/org/example/optional/AllQue3.java

@@ -16,7 +16,7 @@ public class AllQue3 {
   private Que sam;
   private Que bilbo;
 
-  AllQue3(@Named("frodo") Que frodo) {
+  AllQue3(@Named("@Frodo") Que frodo) {
     this.frodo = frodo;
   }
 

inject-test/src/test/java/org/example/optional/AllQue4.java

@@ -16,7 +16,7 @@ public class AllQue4 {
   private Que sam;
   private Que bilbo;
 
-  AllQue4(@Named("frodo") Que frodo) {
+  AllQue4(@Named("@Frodo") Que frodo) {
     this.frodo = frodo;
   }
 

inject-test/src/test/java/org/example/optional/AllQue5.java

@@ -17,7 +17,7 @@ public class AllQue5 {
   /**
    * Use Nullable with constructor argument.
    */
-  AllQue5(@Named("frodo") Que frodo, @Named("sam") Que sam, @Nullable @Named("bilbo") Que bilbo) {
+  AllQue5(@Named("@Frodo") Que frodo, @Named("sam") Que sam, @Nullable @Named("bilbo") Que bilbo) {
     this.frodo = frodo;
     this.sam = sam;
     this.bilbo = bilbo;

inject-test/src/test/java/org/example/optional/AllQue6.java

@@ -16,7 +16,7 @@ public class AllQue6 {
   @Inject @Named("sam") Que sam;
   @Inject @Nullable @Named("bilbo") Que bilbo;
 
-  AllQue6(@Named("frodo") Que frodo) {
+  AllQue6(@Named("@Frodo") Que frodo) {
     this.frodo = frodo;
   }