#261 - Improve generated code for aspects - not generate the unused $DI as we only use the $Proxy$DI

Author: rbygrave

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

@@ -31,6 +31,7 @@ final class MetaData {
    * The list of dependencies with optional and named.
    */
   private List<Dependency> dependsOn;
+  private boolean generateProxy;
 
   MetaData(DependencyMeta meta) {
     this.type = meta.type();
@@ -54,6 +55,14 @@ public String toString() {
     return (name == null) ? type : type + ":" + name;
   }
 
+  /**
+   * Return true if this is a component with Aspects applied to it.
+   * This means this type doesn't have a $DI but instead we have the $Proxy$DI.
+   */
+  boolean isGenerateProxy() {
+    return generateProxy;
+  }
+
   private String trimName(String name) {
     return "".equals(name) ? null : name;
   }
@@ -104,6 +113,7 @@ private List<String> asList(String[] content) {
   void update(BeanReader beanReader) {
     this.provides = beanReader.getProvides();
     this.dependsOn = beanReader.getDependsOn();
+    this.generateProxy = beanReader.isGenerateProxy();
   }
 
   String getType() {
@@ -132,43 +142,45 @@ String getTopPackage() {
   void addImportTypes(Set<String> importTypes) {
     if (hasMethod()) {
       importTypes.add(Util.classOfMethod(method));
-    } else {
+    } else if (!generateProxy) {
       importTypes.add(type + Constants.DI);
     }
   }
 
-  String buildMethod(MetaDataOrdering ordering) {
-    StringBuilder sb = new StringBuilder(200);
-    sb.append("  @DependencyMeta(type=\"").append(type).append("\"");
+  void buildMethod(Append append) {
+    if (generateProxy) {
+      return;
+    }
+    append.append("  @DependencyMeta(type=\"").append(type).append("\"");
     if (name != null) {
-      sb.append(", name=\"").append(name).append("\"");
+      append.append(", name=\"").append(name).append("\"");
     }
     if (hasMethod()) {
-      sb.append(", method=\"").append(method).append("\"");
+      append.append(", method=\"").append(method).append("\"");
     }
     if (!provides.isEmpty()) {
-      appendProvides(sb, "provides", provides);
+      appendProvides(append, "provides", provides);
     }
     if (!dependsOn.isEmpty()) {
-      appendProvides(sb, "dependsOn", dependsOn.stream().map(Dependency::dependsOn).collect(Collectors.toList()));
+      appendProvides(append, "dependsOn", dependsOn.stream().map(Dependency::dependsOn).collect(Collectors.toList()));
     }
-    sb.append(")").append(NEWLINE);
-    sb.append("  protected void build_").append(getBuildName()).append("() {").append(NEWLINE);
+    append.append(")").append(NEWLINE);
+    append.append("  protected void build_").append(getBuildName()).append("() {").append(NEWLINE);
     if (hasMethod()) {
-      sb.append("    ").append(Util.shortMethod(method)).append("(builder");
+      append.append("    ").append(Util.shortMethod(method)).append("(builder");
     } else {
-      sb.append("    ").append(shortType).append(Constants.DI).append(".build(builder");
+      append.append("    ").append(shortType).append(Constants.DI).append(".build(builder");
     }
-    sb.append(");").append(NEWLINE);
-    sb.append("  }").append(NEWLINE);
-    return sb.toString();
+    append.append(");").append(NEWLINE);
+    append.append("  }").append(NEWLINE);
+    append.eol();
   }
 
   private boolean hasMethod() {
     return method != null && !method.isEmpty();
   }
 
-  private void appendProvides(StringBuilder sb, String attribute, List<String> types) {
+  private void appendProvides(Append sb, String attribute, List<String> types) {
     sb.append(", ").append(attribute).append("={");
     for (int i = 0; i < types.size(); i++) {
       if (i > 0) {

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

@@ -185,11 +185,12 @@ void writeBeanHelpers() {
     for (BeanReader beanReader : beanReaders) {
       try {
         if (!beanReader.isWrittenToFile()) {
-          SimpleBeanWriter writer = new SimpleBeanWriter(beanReader, context);
-          writer.write();
           if (beanReader.isGenerateProxy()) {
             SimpleBeanProxyWriter proxyWriter = new SimpleBeanProxyWriter(beanReader, context);
             proxyWriter.write();
+          } else {
+            SimpleBeanWriter writer = new SimpleBeanWriter(beanReader, context);
+            writer.write();
           }
           beanReader.setWrittenToFile();
         }

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

@@ -130,15 +130,17 @@ private void writeBuildMethod() {
     writer.append("    // create beans in order based on constructor dependencies").eol();
     writer.append("    // i.e. \"provides\" followed by \"dependsOn\"").eol();
     for (MetaData metaData : ordering.ordered()) {
-      writer.append("    build_%s();", metaData.getBuildName()).eol();
+      if (!metaData.isGenerateProxy()) {
+        writer.append("    build_%s();", metaData.getBuildName()).eol();
+      }
     }
     writer.append("  }").eol();
     writer.eol();
   }
 
   private void writeBuildMethods() {
     for (MetaData metaData : ordering.ordered()) {
-      writer.append(metaData.buildMethod(ordering)).eol();
+      metaData.buildMethod(writer);
     }
   }