Remove the sortByPriority methods from the public API

Author: rbygrave

inject-test/src/test/java/org/example/coffee/priority/base/PriorityTest.java

@@ -1,7 +1,6 @@
 package org.example.coffee.priority.base;
 
-import io.avaje.inject.BeanScope;
-import io.avaje.inject.SystemContext;
+import io.avaje.inject.ApplicationScope;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
@@ -11,20 +10,8 @@
 public class PriorityTest {
 
   @Test
-  void getBeansByPriority() {
-    final BeanScope context = SystemContext.context();
-
-    final List<BaseIface> beans = context.getBeansByPriority(BaseIface.class);
-    assertExpectedOrder(beans);
-  }
-
-  @Test
-  void sortByPriority() {
-    final BeanScope context = SystemContext.context();
-
-    final List<BaseIface> beans = context.getBeans(BaseIface.class);
-    final List<BaseIface> sorted = context.sortByPriority(beans);
-
+  void listByPriority() {
+    final List<BaseIface> sorted = ApplicationScope.listByPriority(BaseIface.class);
     assertExpectedOrder(sorted);
   }
 

inject-test/src/test/java/org/example/coffee/priority/custom/CustomPriorityTest.java

@@ -1,7 +1,7 @@
 package org.example.coffee.priority.custom;
 
+import io.avaje.inject.ApplicationScope;
 import io.avaje.inject.BeanScope;
-import io.avaje.inject.SystemContext;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
@@ -12,10 +12,9 @@ public class CustomPriorityTest {
 
   @Test
   void test() {
-    final BeanScope context = SystemContext.context();
+    final BeanScope context = ApplicationScope.scope();
 
-    final List<OtherIface> beans = context.getBeans(OtherIface.class);
-    final List<OtherIface> sorted = context.sortByPriority(beans, CustomPriority.class);
+    final List<OtherIface> sorted = context.listByPriority(OtherIface.class, CustomPriority.class);
 
     assertThat(sorted.get(0)).isInstanceOf(COtheri.class);
     assertThat(sorted.get(1)).isInstanceOf(BOtheri.class);

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

@@ -60,15 +60,15 @@ public static BeanScope scope() {
    * @param type an interface or bean type
    */
   public static <T> T get(Class<T> type) {
-    return rootContext.getBean(type);
+    return rootContext.get(type);
   }
 
   /**
    * Return a single bean given the type and name.
    *
    * <pre>{@code
    *
-   *   Heater heater = ApplicationScope.getBean(Heater.class, "electric");
+   *   Heater heater = ApplicationScope.get(Heater.class, "electric");
    *   heater.heat();
    *
    * }</pre>
@@ -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.getBean(type, name);
+    return rootContext.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.getBeans(interfaceType);
+    return rootContext.list(interfaceType);
   }
 
   /**
@@ -112,7 +112,7 @@ 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.getBeansByPriority(interfaceType);
+    return rootContext.listByPriority(interfaceType);
   }
 
   /**

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

@@ -88,7 +88,7 @@ static BeanScopeBuilder newBuilder() {
    *
    * <pre>{@code
    *
-   *   CoffeeMaker coffeeMaker = beanContext.getBean(CoffeeMaker.class);
+   *   CoffeeMaker coffeeMaker = beanScope.get(CoffeeMaker.class);
    *   coffeeMaker.brew();
    *
    * }</pre>
@@ -110,7 +110,7 @@ default <T> T getBean(Class<T> type) {
    *
    * <pre>{@code
    *
-   *   Heater heater = beanContext.getBean(Heater.class, "electric");
+   *   Heater heater = beanScope.get(Heater.class, "electric");
    *   heater.heat();
    *
    * }</pre>
@@ -203,26 +203,6 @@ default <T> List<T> getBeansByPriority(Class<T> interfaceType, Class<? extends A
     return listByPriority(interfaceType, priority);
   }
 
-  /**
-   * Sort the beans by javax.annotation.Priority annotation.
-   *
-   * @param list The beans to sort by priority
-   * @return A new list of beans sorted by priority
-   */
-  <T> List<T> sortByPriority(List<T> list);
-
-  /**
-   * Sort the beans using the given Priority annotation.
-   * <p>
-   * The priority annotation will typically be either <code>javax.annotation.Priority</code>
-   * or <code>jakarta.annotation.Priority</code>.
-   *
-   * @param list     The beans to sort by priority
-   * @param priority The priority annotation used to sort the beans
-   * @return A new list of beans sorted by priority
-   */
-  <T> List<T> sortByPriority(List<T> list, final Class<? extends Annotation> priority);
-
   /**
    * Return a request scoped provided for the specific type and name.
    *

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

@@ -212,16 +212,6 @@ public <T> List<T> listByPriority(Class<T> interfaceType, Class<? extends Annota
       return context.listByPriority(interfaceType, priority);
     }
 
-    @Override
-    public <T> List<T> sortByPriority(List<T> list) {
-      return context.sortByPriority(list);
-    }
-
-    @Override
-    public <T> List<T> sortByPriority(List<T> list, Class<? extends Annotation> priority) {
-      return context.sortByPriority(list, priority);
-    }
-
     @Override
     public void start() {
       context.start();

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

@@ -68,13 +68,7 @@ public <T> List<T> listByPriority(Class<T> interfaceType, Class<? extends Annota
     return list.size() > 1 ? sortByPriority(list, priorityAnnotation) : list;
   }
 
-  @Override
-  public <T> List<T> sortByPriority(List<T> list) {
-    return sortByPriority(list, Priority.class);
-  }
-
-  @Override
-  public <T> List<T> sortByPriority(List<T> list, final Class<? extends Annotation> priorityAnnotation) {
+  private  <T> List<T> sortByPriority(List<T> list, final Class<? extends Annotation> priorityAnnotation) {
     boolean priorityUsed = false;
     List<SortBean<T>> tempList = new ArrayList<>(list.size());
     for (T bean : list) {