Remove candidate method from Builder and BeanScope

Author: rbygrave

inject/src/main/java/io/avaje/inject/BeanScope.java

@@ -128,11 +128,6 @@ default <T> T getBean(Class<T> type, String name) {
     return get(type, name);
   }
 
-  /**
-   * Return the wiring candidate bean with name and priority.
-   */
-  <T> BeanEntry<T> candidate(Class<T> type, String name);
-
   /**
    * Return the list of beans that have an annotation.
    *

inject/src/main/java/io/avaje/inject/DBeanScopeBuilder.java

@@ -192,11 +192,6 @@ public <T> T get(Class<T> beanClass, String name) {
       return context.get(beanClass, name);
     }
 
-    @Override
-    public <T> BeanEntry<T> candidate(Class<T> type, String name) {
-      return context.candidate(type, name);
-    }
-
     @Override
     public List<Object> getBeansWithAnnotation(Class<?> annotation) {
       return context.getBeansWithAnnotation(annotation);

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

@@ -145,11 +145,6 @@ static Builder newBuilder(List<SuppliedBean> suppliedBeans, List<EnrichBean> enr
    */
   <T> Set<T> getSet(Class<T> interfaceType);
 
-  /**
-   * Get a candidate dependency allowing it to be null.
-   */
-  <T> BeanEntry<T> candidate(Class<T> cls, String name);
-
   /**
    * Return a potentially enriched bean for registration into the context.
    * Typically for use with mockito spy.

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

@@ -46,17 +46,9 @@ public <T> T get(Class<T> beanClass) {
     return get(beanClass, null);
   }
 
-  @Override
-  public <T> BeanEntry<T> candidate(Class<T> type, String name) {
-    // sort candidates by priority - Primary, Normal, Secondary
-    EntrySort<T> entrySort = new EntrySort<>();
-    entrySort.add(beans.candidate(type, name));
-    return entrySort.get();
-  }
-
   @Override
   public <T> T get(Class<T> beanClass, String name) {
-    BeanEntry<T> candidate = candidate(beanClass, name);
+    BeanEntry<T> candidate = beans.candidate(beanClass, name);
     return (candidate == null) ? null : candidate.getBean();
   }
 
@@ -74,7 +66,7 @@ public <T> List<T> listByPriority(Class<T> interfaceType) {
 
   @Override
   public <T> List<T> listByPriority(Class<T> interfaceType, Class<? extends Annotation> priorityAnnotation) {
-    List<T> list = getBeans(interfaceType);
+    List<T> list = list(interfaceType);
     return list.size() > 1 ? sortByPriority(list, priorityAnnotation) : list;
   }
 
@@ -144,63 +136,6 @@ public void close() {
     }
   }
 
-  static class EntrySort<T> {
-
-    private BeanEntry<T> supplied;
-    private BeanEntry<T> primary;
-    private int primaryCount;
-    private BeanEntry<T> secondary;
-    private int secondaryCount;
-    private BeanEntry<T> normal;
-    private int normalCount;
-
-    private final List<BeanEntry<T>> all = new ArrayList<>();
-
-    void add(BeanEntry<T> candidate) {
-      if (candidate == null) {
-        return;
-      }
-      if (candidate.isSupplied()) {
-        // a supplied bean trumps all
-        supplied = candidate;
-        return;
-      }
-      all.add(candidate);
-      if (candidate.isPrimary()) {
-        primary = candidate;
-        primaryCount++;
-      } else if (candidate.isSecondary()) {
-        secondary = candidate;
-        secondaryCount++;
-      } else {
-        normal = candidate;
-        normalCount++;
-      }
-    }
-
-    BeanEntry<T> get() {
-      if (supplied != null) {
-        return supplied;
-      }
-      if (primaryCount > 1) {
-        throw new IllegalStateException("Multiple @Primary beans when only expecting one? Beans: " + all);
-      }
-      if (primaryCount == 1) {
-        return primary;
-      }
-      if (normalCount > 1) {
-        throw new IllegalStateException("Multiple beans when only expecting one? Maybe use @Primary or @Secondary? Beans: " + all);
-      }
-      if (normalCount == 1) {
-        return normal;
-      }
-      if (secondaryCount > 1) {
-        throw new IllegalStateException("Multiple @Secondary beans when only expecting one? Beans: " + all);
-      }
-      return secondary;
-    }
-  }
-
   private static class SortBean<T> implements Comparable<SortBean<T>> {
 
     private final T bean;

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

@@ -87,15 +87,8 @@ public <T> List<T> getList(Class<T> interfaceType) {
     return (List<T>) list;
   }
 
-  @Override
-  public <T> BeanEntry<T> candidate(Class<T> cls, String name) {
-    DBeanScope.EntrySort<T> entrySort = new DBeanScope.EntrySort<>();
-    entrySort.add(beanMap.candidate(cls, name));
-    return entrySort.get();
-  }
-
   private <T> T getMaybe(Class<T> beanClass, String name) {
-    BeanEntry<T> entry = candidate(beanClass, name);
+    BeanEntry<T> entry = beanMap.candidate(beanClass, name);
     return (entry == null) ? null : entry.getBean();
   }