Make Generated @DependencyMeta annotations more readable (#365)

* make dependency annotations more readable

* Update DependencyMeta.java

* Update ScopeInfo.java

* Update ScopeInfo.java

* only newline type if no other attributes

* Update MetaData.java

Author: SentryMan

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

@@ -1,4 +1,5 @@
 package io.avaje.inject.generator;
+
 import static io.avaje.inject.generator.ProcessingContext.*;
 
 import java.util.ArrayList;
@@ -35,6 +36,7 @@ final class MetaData {
    * Type deemed to be candidate for providing to another external module.
    */
   private String autoProvides;
+
   private boolean generateProxy;
   private boolean usesExternalDependency;
   private String externalDependency;
@@ -175,23 +177,47 @@ void buildMethod(Append append) {
     if (usesExternalDependency) {
       append.append("  // uses external dependency ").append(externalDependency).append(NEWLINE);
     }
-    append.append("  @DependencyMeta(type=\"").append(type).append("\"");
-    if (name != null) {
-      append.append(", name=\"").append(name).append("\"");
+
+    final var hasName = name != null;
+    final var hasMethod = hasMethod();
+    final var hasProvidesAspect = !providesAspect.isEmpty();
+    final var hasDependsOn = !dependsOn.isEmpty();
+    final var hasProvides = !provides.isEmpty();
+    final var hasAutoProvides = autoProvides != null && !autoProvides.isEmpty();
+
+    append.append("  @DependencyMeta(");
+
+    if (hasName
+        || hasMethod
+        || hasProvidesAspect
+        || hasDependsOn
+        || hasProvides
+        || hasAutoProvides) {
+      append.eol().append("      ");
     }
-    if (hasMethod()) {
-      append.append(", method=\"").append(method).append("\"");
+
+    append.append("type = \"").append(type).append("\"");
+    if (hasName) {
+      append.append(",").eol().append("      name = \"").append(name).append("\"");
+    }
+    if (hasMethod) {
+      append.append(",").eol().append("      method = \"").append(method).append("\"");
     }
-    if (!providesAspect.isEmpty()) {
-      append.append(", providesAspect=\"").append(providesAspect).append("\"");
-    } else if (!provides.isEmpty()) {
+    if (hasProvidesAspect) {
+      append
+          .append(",")
+          .eol()
+          .append("      providesAspect = \"")
+          .append(providesAspect)
+          .append("\"");
+    } else if (hasProvides) {
       appendProvides(append, "provides", provides);
     }
-    if (!dependsOn.isEmpty()) {
+    if (hasDependsOn) {
       appendProvides(append, "dependsOn", dependsOn.stream().map(Dependency::dependsOn).collect(Collectors.toList()));
     }
-    if (autoProvides != null && !autoProvides.isEmpty()) {
-      append.append(", autoProvides=\"").append(autoProvides).append("\"");
+    if (hasAutoProvides) {
+      append.append(",").eol().append("      autoProvides = \"").append(autoProvides).append("\"");
     }
     append.append(")").append(NEWLINE);
     append.append("  private void build_").append(buildName()).append("() {").append(NEWLINE);
@@ -210,15 +236,22 @@ private boolean hasMethod() {
   }
 
   private void appendProvides(Append sb, String attribute, List<String> types) {
-    sb.append(", ").append(attribute).append("={");
+    sb.append(",").eol().append("      ").append(attribute).append(" = {");
+    final var size = types.size();
+    if (size > 1) {
+      sb.eol().append("        ");
+    }
     for (int i = 0; i < types.size(); i++) {
       if (i > 0) {
-        sb.append(",");
+        sb.append(",").eol().append("        ");
       }
       sb.append("\"");
       sb.append(types.get(i));
       sb.append("\"");
     }
+    if (size > 1) {
+      sb.eol().append("      ");
+    }
     sb.append("}");
   }
 

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

@@ -398,7 +398,7 @@ void buildProvides(Append writer) {
 
   private void buildProvidesMethod(Append writer, String fieldName, Set<String> types) {
     writer.append("  @Override").eol();
-    writer.append("  public Class<?>[] %s() { return %s; }", fieldName, fieldName).eol();
+    writer.append("  public Class<?>[] %s() {\n    return %s;\n  }", fieldName, fieldName).eol();
     writer.append("  private final Class<?>[] %s = new Class<?>[]{", fieldName).eol();
     for (final String rawType : types) {
       writer.append("    %s.class,", trimGenerics(rawType)).eol();
@@ -440,7 +440,7 @@ void buildAutoRequiresAspects(Append writer, Set<String> autoRequires) {
   }
 
   void readModuleMetaData(TypeElement moduleType) {
-    InjectModulePrism module = InjectModulePrism.getInstanceOn(moduleType);
+    final InjectModulePrism module = InjectModulePrism.getInstanceOn(moduleType);
     details(module.name(), moduleType);
     readFactoryMetaData(moduleType);
   }

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

@@ -20,7 +20,7 @@ final class SimpleModuleWriter {
     "/**\n" +
       " * Generated source - avaje inject module for %s.\n" +
       " * \n" +
-      " * With Java module system this generated class should be explicitly\n" +
+      " * With the Java module system, this generated class should be explicitly\n" +
       " * registered in module-info via a <code>provides</code> clause like:\n" +
       " * \n" +
       " * <pre>{@code\n" +

inject/src/main/java/io/avaje/inject/spi/DependencyMeta.java

@@ -38,7 +38,7 @@
   String[] provides() default {};
 
   /**
-   * The list of dependencies.
+   * The list of dependencies this bean requires.
    */
   String[] dependsOn() default {};