Merge pull request #330 from avaje/feature/tidy-factory-nullable

Tidy code generation for conditions on factory

Author: rbygrave

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

@@ -399,4 +399,8 @@ void writeConstructorInit(Append writer) {
       writer.append(");").eol();
     }
   }
+
+  boolean hasConditions() {
+    return !conditions.isEmpty();
+  }
 }

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

@@ -135,9 +135,9 @@ MetaData createMeta() {
       .map(t -> "con:" + t)
       .forEach(dependsOn::add);
     conditions.missingTypes.stream()
-        .filter(t -> !t.equals(returnTypeRaw))
-        .map(t -> "con:" + t)
-        .forEach(dependsOn::add);
+      .filter(t -> !t.equals(returnTypeRaw))
+      .map(t -> "con:" + t)
+      .forEach(dependsOn::add);
     for (final MethodParam param : params) {
       dependsOn.add(GenericType.trimWildcard(param.paramType));
     }
@@ -152,8 +152,13 @@ private String fullBuildMethod() {
     return factoryType + Constants.DI + ".build_" + element.getSimpleName().toString();
   }
 
-  String builderGetFactory() {
-    return String.format("      var factory = builder.getNullable(%s.class); %n      if (factory == null) return;", factoryShortName);
+  void builderGetFactory(Append writer, boolean factoryHasConditions) {
+    if (factoryHasConditions) {
+      writer.append("      var factory = builder.getNullable(%s.class);", factoryShortName).eol();
+      writer.append("      if (factory == null) return;").eol();
+    } else {
+      writer.append("      var factory = builder.get(%s.class);", factoryShortName).eol();
+    }
   }
 
   void builderBuildBean(Append writer) {

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

@@ -102,7 +102,7 @@ private void writeFactoryBeanMethod(MethodReader method) {
     writer.append("  public static void build_%s(%s builder) {", method.name(), beanReader.builderType()).eol();
     method.buildConditional(writer);
     method.buildAddFor(writer);
-    writer.append(method.builderGetFactory()).eol();
+    method.builderGetFactory(writer, beanReader.hasConditions());
     if (method.isProtoType()) {
       method.builderAddBeanProvider(writer);
     } else if (method.isUseProviderForSecondary()) {
@@ -160,7 +160,8 @@ private void writeBuildMethodStart() {
     writer.append("  public static void build(%s builder) {", beanReader.builderType()).eol();
   }
 
-  String indent = "     ";
+  private String indent = "     ";
+
   private void writeCreateBean(MethodReader constructor) {
     writer.append(indent).append(" var bean = new %s(", shortName);
     // add constructor dependencies