Remove dead code - more @request scope code from generator removed

Author: rbygrave

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

@@ -19,7 +19,6 @@ class MetaData {
   private final String name;
   private String method;
   private boolean wired;
-  private boolean requestScope;
 
   /**
    * The interfaces and class annotations the bean has (to register into lists).
@@ -32,7 +31,6 @@ class MetaData {
   private List<String> dependsOn;
 
   MetaData(DependencyMeta meta) {
-    this.requestScope = meta.requestScope();
     this.type = meta.type();
     this.name = trimName(meta.name());
     this.shortType = Util.shortName(type);
@@ -110,10 +108,6 @@ String getType() {
     return type;
   }
 
-  boolean isRequestScope() {
-    return requestScope;
-  }
-
   List<String> getProvides() {
     return provides;
   }
@@ -154,9 +148,6 @@ String buildMethod(MetaDataOrdering ordering) {
 
     StringBuilder sb = new StringBuilder(200);
     sb.append("  @DependencyMeta(type=\"").append(type).append("\"");
-    if (requestScope) {
-      sb.append(", requestScope=true");
-    }
     if (name != null) {
       sb.append(", name=\"").append(name).append("\"");
     }

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

@@ -13,7 +13,6 @@ class MetaDataOrdering {
   private final ProcessingContext context;
   private final ScopeInfo scopeInfo;
   private final List<MetaData> orderedList = new ArrayList<>();
-  private final List<MetaData> requestScope = new ArrayList<>();
   private final List<MetaData> queue = new ArrayList<>();
   private final Map<String, ProviderList> providers = new HashMap<>();
   private final List<DependencyLink> circularDependencies = new ArrayList<>();
@@ -23,11 +22,7 @@ class MetaDataOrdering {
     this.context = context;
     this.scopeInfo = scopeInfo;
     for (MetaData metaData : values) {
-      if (metaData.isRequestScope()) {
-        // request scoped expected to have externally provided dependencies
-        requestScope.add(metaData);
-        metaData.setWired();
-      } else if (metaData.noDepends()) {
+      if (metaData.noDepends()) {
         orderedList.add(metaData);
         metaData.setWired();
       } else {
@@ -195,18 +190,11 @@ List<MetaData> getOrdered() {
     return orderedList;
   }
 
-  List<MetaData> getRequestScope() {
-    return requestScope;
-  }
-
   Set<String> getImportTypes() {
     Set<String> importTypes = new TreeSet<>();
     for (MetaData metaData : orderedList) {
       metaData.addImportTypes(importTypes);
     }
-    for (MetaData metaData : requestScope) {
-      metaData.addImportTypes(importTypes);
-    }
     return importTypes;
   }
 

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

@@ -3,7 +3,6 @@
 import javax.tools.FileObject;
 import java.io.IOException;
 import java.io.Writer;
-import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 
@@ -96,14 +95,6 @@ private void writeBuildMethod() {
     for (MetaData metaData : ordering.getOrdered()) {
       writer.append("    build_%s();", metaData.getBuildName()).eol();
     }
-    final List<MetaData> requestScope = ordering.getRequestScope();
-    if (!requestScope.isEmpty()) {
-      writer.eol();
-      writer.append("    // request scope providers").eol();
-      for (MetaData metaData : requestScope) {
-        writer.append("    build_%s();", metaData.getBuildName()).eol();
-      }
-    }
     writer.append("  }").eol();
     writer.eol();
   }
@@ -112,9 +103,6 @@ private void writeBuildMethods() {
     for (MetaData metaData : ordering.getOrdered()) {
       writer.append(metaData.buildMethod(ordering)).eol();
     }
-    for (MetaData metaData : ordering.getRequestScope()) {
-      writer.append(metaData.buildMethod(ordering)).eol();
-    }
   }
 
   private void writePackage() {

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

@@ -5,11 +5,6 @@
  */
 public @interface DependencyMeta {
 
-  /**
-   * Request scope
-   */
-  boolean requestScope() default false;
-
   /**
    * The bean type.
    */