Tidy up listByAnnotation() methods

Author: rbygrave

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

@@ -30,7 +30,7 @@
  */
 public class ApplicationScope {
 
-  private static final BeanScope rootContext = init();
+  private static final BeanScope appScope = init();
 
   private static BeanScope init() {
     return BeanScope.newBuilder().build();
@@ -44,7 +44,7 @@ private ApplicationScope() {
    * Return the underlying BeanContext.
    */
   public static BeanScope scope() {
-    return rootContext;
+    return appScope;
   }
 
   /**
@@ -60,7 +60,7 @@ public static BeanScope scope() {
    * @param type an interface or bean type
    */
   public static <T> T get(Class<T> type) {
-    return rootContext.get(type);
+    return appScope.get(type);
   }
 
   /**
@@ -77,7 +77,7 @@ public static <T> T get(Class<T> type) {
    * @param name the name qualifier of a specific bean
    */
   public static <T> T get(Class<T> type, String name) {
-    return rootContext.get(type, name);
+    return appScope.get(type, name);
   }
 
 
@@ -95,7 +95,7 @@ public static <T> T get(Class<T> type, String name) {
    * @param interfaceType An interface class.
    */
   public static <T> List<T> list(Class<T> interfaceType) {
-    return rootContext.list(interfaceType);
+    return appScope.list(interfaceType);
   }
 
   /**
@@ -112,7 +112,29 @@ public static <T> List<T> list(Class<T> interfaceType) {
    * @param interfaceType An interface class.
    */
   public static <T> List<T> listByPriority(Class<T> interfaceType) {
-    return rootContext.listByPriority(interfaceType);
+    return appScope.listByPriority(interfaceType);
+  }
+
+  /**
+   * Return the list of beans that have an annotation.
+   *
+   * <pre>{@code
+   *
+   *   // e.g. register all controllers with web a framework
+   *   // .. where Controller is an annotation on the beans
+   *
+   *   List<Object> controllers = ApplicationScope.listByAnnotation(Controller.class);
+   *
+   * }</pre>
+   *
+   * <p>
+   * The classic use case for this is registering controllers or routes to
+   * web frameworks like Sparkjava, Javlin, Rapidoid etc.
+   *
+   * @param annotation An annotation class.
+   */
+  public static List<Object> listByAnnotation(Class<?> annotation) {
+    return appScope.listByAnnotation(annotation);
   }
 
   /**
@@ -121,6 +143,6 @@ public static <T> List<T> listByPriority(Class<T> interfaceType) {
    * @return The request scope builder
    */
   public static RequestScopeBuilder newRequestScope() {
-    return rootContext.newRequestScope();
+    return appScope.newRequestScope();
   }
 }

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

@@ -136,7 +136,7 @@ default <T> T getBean(Class<T> type, String name) {
    *   // e.g. register all controllers with web a framework
    *   // .. where Controller is an annotation on the beans
    *
-   *   List<Object> controllers = SystemContext.getBeansWithAnnotation(Controller.class);
+   *   List<Object> controllers = ApplicationScope.listByAnnotation(Controller.class);
    *
    * }</pre>
    *
@@ -146,7 +146,15 @@ default <T> T getBean(Class<T> type, String name) {
    *
    * @param annotation An annotation class.
    */
-  List<Object> getBeansWithAnnotation(Class<?> annotation);
+  List<Object> listByAnnotation(Class<?> annotation);
+
+  /**
+   * Deprecated - migrate to listByAnnotation()
+   */
+  @Deprecated
+  default List<Object> getBeansWithAnnotation(Class<?> annotation) {
+    return listByAnnotation(annotation);
+  }
 
   /**
    * Return the list of beans that implement the interface.
@@ -155,7 +163,7 @@ default <T> T getBean(Class<T> type, String name) {
    *
    *   // e.g. register all routes for a web framework
    *
-   *   List<WebRoute> routes = SystemContext.getBeans(WebRoute.class);
+   *   List<WebRoute> routes = ApplicationScope.list(WebRoute.class);
    *
    * }</pre>
    *

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

@@ -193,8 +193,8 @@ public <T> T get(Class<T> beanClass, String name) {
     }
 
     @Override
-    public List<Object> getBeansWithAnnotation(Class<?> annotation) {
-      return context.getBeansWithAnnotation(annotation);
+    public List<Object> listByAnnotation(Class<?> annotation) {
+      return context.listByAnnotation(annotation);
     }
 
     @Override

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

@@ -51,11 +51,11 @@ public static <T> T getBean(Class<T> type, String name) {
   }
 
   /**
-   * Deprecated - removing support for this method.
+   * Deprecated - migrate to ApplicationScope.listByAnnotation(annotation).
    */
   @Deprecated
   public static List<Object> getBeansWithAnnotation(Class<?> annotation) {
-    return ApplicationScope.scope().getBeansWithAnnotation(annotation);
+    return ApplicationScope.listByAnnotation(annotation);
   }
 
   /**

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

@@ -92,7 +92,7 @@ private  <T> List<T> sortByPriority(List<T> list, final Class<? extends Annotati
   }
 
   @Override
-  public List<Object> getBeansWithAnnotation(Class<?> annotation) {
+  public List<Object> listByAnnotation(Class<?> annotation) {
     return beans.all(annotation);
   }
 

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

@@ -91,13 +91,12 @@ public <T> Provider<T> getProvider(Class<T> type, String name) {
 
   @Override
   public <T> List<T> getList(Class<T> interfaceType) {
-    return beanScope.getBeans(interfaceType);
+    return beanScope.list(interfaceType);
   }
 
   @Override
   public <T> Set<T> getSet(Class<T> interfaceType) {
-    //TODO Refactor this
-    return new LinkedHashSet<>(beanScope.getBeans(interfaceType));
+    return new LinkedHashSet<>(beanScope.list(interfaceType));
   }
 
   @Override