#262 - De-duplication for autoProvides and autoRequires

Any dependencies on the explicit provides are removed from autoProvides
and similarly with requires and autoRequires

Also change the style of generation for these provides/requires methods
so that the field is always used and follows the method - slightly funky
but keeps the fields and methods together.

Author: rbygrave

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

@@ -379,57 +379,47 @@ private void attributeClasses(boolean leadingComma, Append writer, String prefix
     writer.append("}");
   }
 
-  private void buildClassArray(Append writer, Set<String> values) {
-    writer.append("new Class<?>[]");
-    writer.append("{");
-    if (!values.isEmpty()) {
-      int c = 0;
-      for (String value : values) {
-        if (c++ > 0) {
-          writer.append(",");
-        }
-        writer.append(value).append(".class");
-      }
-    }
-    writer.append("}");
-  }
-
-  void buildFields(Append writer) {
+  void buildProvides(Append writer) {
     if (!provides.isEmpty()) {
-      writer.append("  private final Class<?>[] provides = ");
-      buildClassArray(writer, provides);
-      writer.append(";").eol();
+      buildProvidesMethod(writer, "provides", provides);
     }
     if (!requires.isEmpty()) {
-      writer.append("  private final Class<?>[] requires = ");
-      buildClassArray(writer, requires);
-      writer.append(";").eol();
+      buildProvidesMethod(writer, "requires", requires);
     }
     if (!requiresPackages.isEmpty()) {
-      writer.append("  private final Class<?>[] requiresPackages = ");
-      buildClassArray(writer, requiresPackages);
-      writer.append(";").eol();
+      buildProvidesMethod(writer, "requiresPackages", requiresPackages);
     }
-    writer.append("  private Builder builder;").eol().eol();
   }
 
-  void buildProvides(Append writer) {
-    if (!provides.isEmpty()) {
-      buildProvidesMethod(writer, "provides");
+  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("  private final Class<?>[] %s = new Class<?>[]{", fieldName).eol();
+    for (String rawType : types) {
+      writer.append("    %s.class,", rawType).eol();
     }
-    if (!requires.isEmpty()) {
-      buildProvidesMethod(writer, "requires");
+    writer.append("  };").eol().eol();
+  }
+
+  void buildAutoProvides(Append writer, Set<String> autoProvides) {
+    autoProvides.removeAll(provides);
+    if (!autoProvides.isEmpty()) {
+      buildProvidesMethod(writer, "autoProvides", autoProvides);
     }
-    if (!requiresPackages.isEmpty()) {
-      buildProvidesMethod(writer, "requiresPackages");
+  }
+
+  void buildAutoProvidesAspects(Append writer, Set<String> autoProvidesAspects) {
+    autoProvidesAspects.removeAll(provides);
+    if (!autoProvidesAspects.isEmpty()) {
+      buildProvidesMethod(writer, "autoProvidesAspects", autoProvidesAspects);
     }
   }
 
-  private void buildProvidesMethod(Append writer, String fieldName) {
-    writer.append("  @Override").eol();
-    writer.append("  public Class<?>[] %s() {", fieldName).eol();
-    writer.append("    return %s;", fieldName).eol();
-    writer.append("  }").eol().eol();
+  void buildAutoRequires(Append writer, Set<String> autoRequires) {
+    autoRequires.removeAll(requires);
+    if (!autoRequires.isEmpty()) {
+      buildProvidesMethod(writer, "autoRequires", autoRequires);
+    }
   }
 
   void readModuleMetaData(TypeElement moduleType) {

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

@@ -65,7 +65,7 @@ void write(ScopeInfo.Type scopeType) throws IOException {
     writer = new Append(createFileWriter());
     writePackage();
     writeStartClass();
-    writeAutoProvides();
+    writeProvides();
     writeClassesMethod();
     writeBuildMethod();
     writeBuildMethods();
@@ -90,7 +90,7 @@ private void writeServicesFile(ScopeInfo.Type scopeType) {
     }
   }
 
-  private void writeAutoProvides() {
+  private void writeProvides() {
     Set<String> autoProvidesAspects = new TreeSet<>();
     Set<String> autoProvides = new TreeSet<>();
 
@@ -105,33 +105,23 @@ private void writeAutoProvides() {
       }
     }
     if (!autoProvides.isEmpty()) {
-      writer.append("  @Override").eol();
-      writer.append("  public Class<?>[] autoProvides() {").eol();
-      writeReturnClassArray(autoProvides);
+      scopeInfo.buildAutoProvides(writer, autoProvides);
     }
     if (!autoProvidesAspects.isEmpty()) {
-      writer.append("  @Override").eol();
-      writer.append("  public Class<?>[] autoProvidesAspects() {").eol();
-      writeReturnClassArray(autoProvidesAspects);
+      scopeInfo.buildAutoProvidesAspects(writer, autoProvidesAspects);
     }
     Set<String> autoRequires = ordering.autoRequires();
     if (!autoRequires.isEmpty()) {
-      writer.append("  @Override").eol();
-      writer.append("  public Class<?>[] autoRequires() {").eol();
-      writeReturnClassArray(autoRequires);
+      scopeInfo.buildAutoRequires(writer, autoRequires);
     }
   }
 
   private void writeClassesMethod() {
     Set<String> allClasses = distinctPublicClasses();
     writer.append("  @Override").eol();
     writer.append("  public Class<?>[] classes() {").eol();
-    writeReturnClassArray(new TreeSet<>(allClasses));
-  }
-
-  private void writeReturnClassArray(Set<String> types) {
     writer.append("    return new Class<?>[]{").eol();
-    for (String rawType : types) {
+    for (String rawType : new TreeSet<>(allClasses)) {
       writer.append("      %s.class,", rawType).eol();
     }
     writer.append("    };").eol();
@@ -211,7 +201,7 @@ private void writeStartClass() {
 
     String interfaceType = scopeInfo.type().type();
     writer.append("public final class %s implements %s {", shortName, interfaceType).eol().eol();
-    scopeInfo.buildFields(writer);
+    writer.append("  private Builder builder;").eol().eol();
     if (scopeInfo.addModuleConstructor()) {
       writeConstructor();
     }