WICKET-7126 javadoc + exception messages + code cleanup

Author: pedrosans

wicket-cdi/src/main/java/org/apache/wicket/cdi/BeanManagerLookup.java

@@ -32,7 +32,10 @@
  * <li>JNDI under java:comp/env/BeanManager (for servlet containers like Tomcat and Jetty)</li>
  * <li>CDI.current().getBeanManager() (portable lookup)</li>
  * </ul>
- * 
+ *
+ * This is de default strategy used in {@link CdiConfiguration} to look for a BeanManger, unless
+ * one is defined in CdiConfiguration(BeanManager)
+ *
  * @author papegaaij
  */
 public final class BeanManagerLookup
@@ -88,6 +91,11 @@ public BeanManager lookup()
 		public abstract BeanManager lookup();
 	}
 
+	private BeanManagerLookup()
+	{
+
+	}
+
 	public static BeanManager lookup()
 	{
 		for (BeanManagerLookupStrategy curStrategy : BeanManagerLookupStrategy.values())

wicket-cdi/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java

@@ -17,10 +17,10 @@
 package org.apache.wicket.cdi;
 
 import jakarta.enterprise.inject.spi.BeanManager;
-
 import org.apache.wicket.Application;
 import org.apache.wicket.MetaDataKey;
 import org.apache.wicket.request.cycle.RequestCycleListenerCollection;
+import org.apache.wicket.util.lang.Args;
 
 /**
  * Configures CDI integration
@@ -48,6 +48,7 @@ public CdiConfiguration()
 
 	public CdiConfiguration(BeanManager beanManager)
 	{
+		Args.notNull(beanManager, "beanManager");
 		this.beanManager = beanManager;
 	}
 
@@ -65,8 +66,11 @@ public CdiConfiguration setPropagation(IConversationPropagation propagation)
 	public BeanManager getBeanManager()
 	{
 		if (beanManager == null)
+		{
 			throw new IllegalStateException(
-				"app not configured or no BeanManager was resolved during the configuration");
+				"No BeanManager was resolved during configuration. Be sure " +
+					"to specify a BeanManager in CdiConfiguration constructor or that one can be resolved by BeanManagerLookup, and that CdiConfiguration#configure is called.");
+		}
 		return beanManager;
 	}
 
@@ -77,12 +81,16 @@ public BeanManager getBeanManager()
 	 */
 	public void configure(Application application)
 	{
-		if(beanManager == null)
+		if (beanManager == null)
+		{
 			beanManager = BeanManagerLookup.lookup();
+		}
 
 		if (beanManager == null)
+		{
 			throw new IllegalStateException(
 				"No BeanManager was set or found via the CDI provider. Check your CDI setup or specify a BeanManager in the CdiConfiguration.");
+		}
 
 		if (application.getMetaData(CDI_CONFIGURATION_KEY) != null)
 		{