Fix Lazy Priority Generation (#937)

It seems that the `asPrimary` code was not getting generated

Author: SentryMan

blackbox-test-inject/src/main/java/org/example/myapp/lazy/GreetingService.java

@@ -0,0 +1,42 @@
+package org.example.myapp.lazy;
+
+import io.avaje.inject.Lazy;
+import io.avaje.inject.Primary;
+import jakarta.inject.Singleton;
+
+interface GreetingService {
+  String greet();
+}
+
+@Lazy(Lazy.Kind.PROVIDER)
+@Singleton
+class EnglishGreeting implements GreetingService {
+  @Override
+  public String greet() {
+    return "Hello";
+  }
+}
+
+@Primary
+@Lazy(Lazy.Kind.PROVIDER)
+@Singleton
+class SpanishGreeting implements GreetingService {
+  @Override
+  public String greet() {
+    return "Hola";
+  }
+}
+
+@Lazy(Lazy.Kind.PROVIDER)
+@Singleton
+class Greeter {
+  private final GreetingService service;
+
+  Greeter(GreetingService service) {
+    this.service = service;
+  }
+
+  String run() {
+    return service.greet();
+  }
+}

blackbox-test-inject/src/test/java/org/example/myapp/lazy/LazyTest.java

@@ -97,6 +97,14 @@ void testAOP() {
     }
   }
 
+  @Test
+  void testLazyPriority() {
+    try (var scope = BeanScope.builder().build()) {
+      var greeter = scope.get(Greeter.class);
+      assertThat(greeter.run()).isEqualTo("Hola");
+    }
+  }
+
   @Test
   void testOldLazyBehavior() {
     var initialized = new AtomicBoolean();

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

@@ -367,14 +367,18 @@ void buildRegister(Append writer) {
       writer.append("var $bean = ");
     }
     writer.append("builder.");
+    writePriority(writer);
+    writer.append("register(bean);").eol();
+  }
+
+  void writePriority(Append writer) {
     if (primary) {
       writer.append("asPrimary().");
     } else if (secondary) {
       writer.append("asSecondary().");
     } else if (priority != null) {
       writer.append("asPriority(%s).", priority);
     }
-    writer.append("register(bean);").eol();
   }
 
   void addLifecycleCallbacks(Append writer, String indent) {
@@ -599,17 +603,15 @@ String shortName() {
   String packageName() {
     if (importedComponent) {
       return beanPackageName() + ".di";
-    } else {
-      return beanPackageName();
     }
+    return beanPackageName();
   }
 
   private String beanPackageName() {
     if (beanType.getNestingKind().isNested()) {
       return Util.nestedPackageOf(beanQualifiedName());
-    } else {
-      return ProcessorUtils.packageOf(beanQualifiedName());
     }
+    return ProcessorUtils.packageOf(beanQualifiedName());
   }
 
   private String beanQualifiedName() {

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

@@ -281,12 +281,9 @@ void builderAddBeanProvider(Append writer) {
 
     String indent = "    ";
     writer.indent(indent).append("  builder");
+    writePriority(writer);
     if (prototype) {
       writer.append(".asPrototype()");
-    } else if (secondary) {
-      writer.append(".asSecondary()");
-    } else if (priority != null) {
-      writer.append(".asPriority(%s)", priority);
     }
 
     if (proxyLazy) {
@@ -341,13 +338,9 @@ void builderBuildAddBean(Append writer) {
       }
 
       writer.append("builder");
-      if (primary) {
-        writer.append(".asPrimary()");
-      } else if (secondary) {
-        writer.append(".asSecondary()");
-      } else if (priority != null) {
-        writer.append(".asPriority(%s)", priority);
-      } else if (prototype) {
+      writePriority(writer);
+
+      if (prototype) {
         writer.append(".asPrototype()");
       }
 
@@ -412,6 +405,16 @@ void builderBuildAddBean(Append writer) {
     }
   }
 
+  void writePriority(Append writer) {
+    if (primary) {
+      writer.append(".asPrimary()");
+    } else if (secondary) {
+      writer.append(".asSecondary()");
+    } else if (priority != null) {
+      writer.append(".asPriority(%s)", priority);
+    }
+  }
+
   static String priority(Integer priority) {
     return priority == null || priority == 1000 ? "" : ", " + priority;
   }

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

@@ -186,7 +186,9 @@ private void writeAddFor(MethodReader constructor) {
         registerProvider = "asPrototype().registerProvider";
       }
 
-      writer.append("      builder.%s(() -> {", registerProvider).eol();
+      writer.append("      builder.");
+      beanReader.writePriority(writer);
+      writer.append("%s(() -> {", registerProvider).eol();
     }
     constructor.startTry(writer);
     writeCreateBean(constructor);

inject-generator/src/test/java/io/avaje/inject/generator/models/valid/lazy/LazyBean.java

@@ -3,12 +3,14 @@
 import java.io.IOException;
 
 import io.avaje.inject.Lazy;
+import io.avaje.inject.Primary;
 import jakarta.inject.Inject;
 import jakarta.inject.Provider;
 import jakarta.inject.Singleton;
 
 @Lazy
 @Singleton
+@Primary
 public class LazyBean {
 
   Provider<Integer> intProvider;

inject-generator/src/test/java/io/avaje/inject/generator/models/valid/lazy/LazyFactory.java

@@ -3,6 +3,7 @@
 import io.avaje.inject.Bean;
 import io.avaje.inject.Factory;
 import io.avaje.inject.Lazy;
+import io.avaje.inject.Primary;
 
 @Lazy
 @Factory
@@ -13,6 +14,7 @@ Integer lazyInt() {
     return 0;
   }
 
+  @Primary
   @Bean
   LazyInterface lazyInterface() {
     return null;