From fba83f542f96ac6cbe6dcd308e57eb45f1b4f2de Mon Sep 17 00:00:00 2001
From: geopossachs <10324450+geopossachs@users.noreply.github.com>
Date: Sun, 8 Oct 2023 19:47:48 +0200
Subject: [PATCH] switch to CDI bean with beans.xml

---
 .../bootsfaces/component/ComponentUtils.java  | 19 +++++++++----------
 .../component/colorPicker/ColorPicker.java    |  3 ++-
 .../RadioButtonInternalStateBean.java         |  6 +++---
 .../SearchExpressionResolverBean.java         | 12 +++++++-----
 src/main/meta/META-INF/beans.xml              |  6 ++++++
 5 files changed, 27 insertions(+), 19 deletions(-)
 create mode 100644 src/main/meta/META-INF/beans.xml

diff --git a/src/main/java/net/bootsfaces/component/ComponentUtils.java b/src/main/java/net/bootsfaces/component/ComponentUtils.java
index 06ef5017..6a3cee14 100644
--- a/src/main/java/net/bootsfaces/component/ComponentUtils.java
+++ b/src/main/java/net/bootsfaces/component/ComponentUtils.java
@@ -1,26 +1,25 @@
 package net.bootsfaces.component;
 
-
-import jakarta.annotation.ManagedBean;
 import jakarta.enterprise.context.RequestScoped;
 import jakarta.faces.context.FacesContext;
+import jakarta.inject.Named;
 import net.bootsfaces.beans.ELTools;
 
-@ManagedBean
+@Named
 @RequestScoped
 public class ComponentUtils {
+
 	private boolean renderLabelDefault = true;
 
 	public ComponentUtils() {
 		try {
-		String renderLabel = FacesContext.getCurrentInstance().getExternalContext()
+			String renderLabel = FacesContext.getCurrentInstance().getExternalContext()
 				.getInitParameter("net.bootsfaces.defaults.renderLabel");
-		if (null != renderLabel && renderLabel.contains("#{")) {
-			renderLabelDefault = (Boolean) ELTools.evalAsObject(renderLabel);
-		}
-		else if (null != renderLabel) {
-			renderLabelDefault = Boolean.valueOf(renderLabel);
-		}
+			if (null != renderLabel && renderLabel.contains("#{")) {
+				renderLabelDefault = (Boolean) ELTools.evalAsObject(renderLabel);
+			} else if (null != renderLabel) {
+				renderLabelDefault = Boolean.valueOf(renderLabel);
+			}
 		} catch (Exception e) {
 			System.out.println("Exception when reading net.bootsfaces.defaults.renderLabel");
 		}
diff --git a/src/main/java/net/bootsfaces/component/colorPicker/ColorPicker.java b/src/main/java/net/bootsfaces/component/colorPicker/ColorPicker.java
index 1c2163db..3e71969e 100644
--- a/src/main/java/net/bootsfaces/component/colorPicker/ColorPicker.java
+++ b/src/main/java/net/bootsfaces/component/colorPicker/ColorPicker.java
@@ -167,7 +167,8 @@ public boolean isDisabled() {
 	 * @return Returns the value of the attribute, or false, if it hasn't been set by the JSF file.
 	 */
 	public boolean isRenderLabel() {
-		return (boolean) (Boolean) getStateHelper().eval(PropertyKeys.renderLabel, net.bootsfaces.component.ComponentUtils.isRenderLabelDefault());
+		return (boolean) (Boolean) getStateHelper().eval(PropertyKeys.renderLabel, 
+			net.bootsfaces.component.ComponentUtils.isRenderLabelDefault());
 	}
 
 
diff --git a/src/main/java/net/bootsfaces/component/radiobutton/RadioButtonInternalStateBean.java b/src/main/java/net/bootsfaces/component/radiobutton/RadioButtonInternalStateBean.java
index 5440a5d0..68c232af 100644
--- a/src/main/java/net/bootsfaces/component/radiobutton/RadioButtonInternalStateBean.java
+++ b/src/main/java/net/bootsfaces/component/radiobutton/RadioButtonInternalStateBean.java
@@ -3,13 +3,13 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import jakarta.annotation.ManagedBean;
 import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Named;
 
-
-@ManagedBean
+@Named
 @RequestScoped
 public class RadioButtonInternalStateBean {
+
 	private Map<String, Boolean> inputHasAlreadyBeenRendered = new HashMap<String, Boolean>();
 
 	public boolean inputHasAlreadyBeenRendered(String key) {
diff --git a/src/main/java/net/bootsfaces/expressions/SearchExpressionResolverBean.java b/src/main/java/net/bootsfaces/expressions/SearchExpressionResolverBean.java
index 4d69e260..53c40a1a 100644
--- a/src/main/java/net/bootsfaces/expressions/SearchExpressionResolverBean.java
+++ b/src/main/java/net/bootsfaces/expressions/SearchExpressionResolverBean.java
@@ -1,19 +1,21 @@
 package net.bootsfaces.expressions;
 
-import jakarta.annotation.ManagedBean;
 import jakarta.enterprise.context.RequestScoped;
 import jakarta.faces.component.UIComponent;
 import jakarta.faces.context.FacesContext;
+import jakarta.inject.Named;
 
-@ManagedBean
+@Named
 @RequestScoped
 public class SearchExpressionResolverBean {
+
 	public String resolve(UIComponent component, String expression) {
 		String componentIDs = ExpressionResolver.getComponentIDs(FacesContext.getCurrentInstance(), component, expression);
-		if (componentIDs.indexOf(' ')>=0) {
+		if (componentIDs.indexOf(' ') >= 0) {
 			// multiple component ids
 			componentIDs = componentIDs.replace(" ", " :");
 		}
-		return ":"+componentIDs;
+		return ":" + componentIDs;
 	}
-}
\ No newline at end of file
+	
+}
diff --git a/src/main/meta/META-INF/beans.xml b/src/main/meta/META-INF/beans.xml
new file mode 100644
index 00000000..4e4cb11f
--- /dev/null
+++ b/src/main/meta/META-INF/beans.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+       version="4.0" bean-discovery-mode="annotated">
+</beans>
\ No newline at end of file