Adding method for simplified bean-resolving

cuioss · Oct 10, 2023 · fdc09b7 · fdc09b7
1 parent ae00fce
commit fdc09b7
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 4 deletions.
diff --git a/modules/core/portal-core/src/main/java/de/cuioss/portal/core/cdi/PortalBeanManager.java b/modules/core/portal-core/src/main/java/de/cuioss/portal/core/cdi/PortalBeanManager.java
@@ -71,9 +71,8 @@ private static <T, V extends Annotation> T getCDIBean(final BeanManager beanMana
     }
 
     private static List<Bean<?>> sortByPriority(final List<Bean<?>> toBeSorted) {
-        if (toBeSorted.size() < 2) {
+        if (toBeSorted.size() < 2)
             return toBeSorted;
-        }
         final List<PriorityComparator> wrapperList = new ArrayList<>();
         for (final Bean<?> element : toBeSorted) {
             wrapperList.add(new PriorityComparator(element));
@@ -120,6 +119,20 @@ public static <T, V extends Annotation> T resolveBeanOrThrowIllegalStateExceptio
                 () -> new IllegalStateException("Portal-532: " + createErrorMessage(beanClass, annotationClass)));
     }
 
+    /**
+     * Shorthand for calling
+     * {@link #resolveBeanOrThrowIllegalStateException(Class, Class)} with
+     * {@code null} for the parameter annotation.
+     *
+     * @param beanClass identifying the type to be loaded, must not be null
+     * @param <T>
+     *
+     * @return the found bean, or {@link Optional#empty()} if none could be found
+     */
+    public static <T> T resolveRequiredBean(final Class<T> beanClass) {
+        return resolveBeanOrThrowIllegalStateException(beanClass, null);
+    }
+
     /**
      * Helper method for resolving the beanTypes according to the given identifier.
      *
@@ -155,9 +168,8 @@ public static <T, V extends Annotation> Set<Bean<?>> resolveBeanTypes(final Bean
      */
     private static <T, V extends Annotation> void checkBeanTypesFound(final Class<T> beanClass,
             final Class<V> annotationClass, final Set<Bean<?>> beanTypes) {
-        if (beanTypes.isEmpty()) {
+        if (beanTypes.isEmpty())
             throw new IllegalArgumentException(createErrorMessage(beanClass, annotationClass));
-        }
     }
 
     /**

diff --git a/modules/core/portal-core/src/test/java/de/cuioss/portal/core/cdi/PortalBeanManagerTest.java b/modules/core/portal-core/src/test/java/de/cuioss/portal/core/cdi/PortalBeanManagerTest.java
@@ -17,6 +17,7 @@
 
 import static de.cuioss.portal.core.cdi.PortalBeanManager.resolveBean;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -78,4 +79,11 @@ void shouldThrowExceptionOnZeroBeansFound() {
         });
     }
 
+    @Test
+    void shouldReturnSimpleRequiredWithoutQualifier() {
+        final var check = PortalBeanManager.resolveRequiredBean(TestBeanWithoutQualifier.class);
+        assertNotNull(check);
+        assertEquals(TestBeanWithQualifier.MESSAGE, check.getInitMessage());
+    }
+
 }
diff --git a/...it-testing/src/main/java/de/cuioss/portal/core/test/junit5/EnablePortalConfiguration.java b/...it-testing/src/main/java/de/cuioss/portal/core/test/junit5/EnablePortalConfiguration.java
@@ -43,6 +43,9 @@
  * <p>
  * Additional configuration can be added by using {@link #configuration()}
  * </p>
+ * <p>
+ * For details on usage, see {@link PortalTestConfiguration}
+ * </p>
  *
  * @author Oliver Wolff
  */