#103 - Handle @nAmed with empty string / no actual string qualifier name

avaje · May 11, 2021 · b3988ed · b3988ed
1 parent c937a61
commit b3988ed
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 2 deletions.
diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/BeanReader.java b/inject-generator/src/main/java/io/avaje/inject/generator/BeanReader.java
@@ -283,7 +283,7 @@ boolean isExtraInjectionRequired() {
 
   void buildAddFor(Append writer) {
     writer.append("    if (builder.isAddBeanFor(");
-    if (name != null) {
+    if (name != null && !name.isEmpty()) {
       writer.append("\"%s\", ", name);
     }
     writer.append(typeReader.getTypesRegister());

diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/MethodReader.java b/inject-generator/src/main/java/io/avaje/inject/generator/MethodReader.java
@@ -176,7 +176,7 @@ void buildAddFor(Append writer) {
     if (isVoid) {
       writer.append("Void.class");
     } else {
-      if (name != null) {
+      if (name != null && !name.isEmpty()) {
         writer.append("\"%s\", ", name);
       }
       if (typeReader != null) {

diff --git a/inject-test/src/test/java/org/example/coffee/qualifier/FooQual.java b/inject-test/src/test/java/org/example/coffee/qualifier/FooQual.java
@@ -0,0 +1,12 @@
+package org.example.coffee.qualifier;
+
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
+
+/**
+ * Named with empty string.
+ */
+@Named
+@Singleton
+public class FooQual {
+}
diff --git a/inject-test/src/test/java/org/example/coffee/qualifier/FooQualTest.java b/inject-test/src/test/java/org/example/coffee/qualifier/FooQualTest.java
@@ -0,0 +1,15 @@
+package org.example.coffee.qualifier;
+
+import io.avaje.inject.SystemContext;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class FooQualTest {
+
+  @Test
+  void test() {
+    FooQual bean = SystemContext.getBean(FooQual.class);
+    assertThat(bean).isNotNull();
+  }
+}